Conflicts:
geocamTalk/templates/geocamTalk/base.html
geocamTalk/templates/geocamTalk/message_list.html
Resolved conflicts application appears to be working except for a
QuickTime loading issue, need to explore if it's because of the merge or
because of jQuery Mobile