Merge branch 'pilot'

Conflicts:
app.coffee
images/contactview/contactview_bottombar.jpg
images/contactview/contactview_content.jpg
images/contactview/contactview_topbar.jpg
images/findfriend/findfriend_bottombar.jpg
images/findfriend/findfriend_content.jpg
images/findfriend/findfriend_topbar.jpg
images/launch.jpg
images/mainframe/mainframe_bottombar.jpg
images/mainframe/mainframe_content.jpg
images/mainframe/mainframe_topbar.jpg
images/moreview/moreview_bottombar.jpg
images/moreview/moreview_topbar.jpg
index.html