Combined ChatClient and NFCActivity into one project.  ChatClient's add friend button opens NFCActivity.
Combined tacobox into tacobox-android project and removed tacobox project.
Combined tacobox-android project into CypherSydekick project.  ChatClient's game button opens the game activity.
Removed old projects.
Updated MessagesServlet in preparation for demo.
Updated MessagesServlet mapping to match documentation.
Re-added project files.
Added some additional exception output for exceptions during startup.
Moved databse ignore into Server/.gitignore.
Moved root .gitignore to CypherSydekick/ and added a .gitignore for LocalStorage.
Added Main.launch to simplify building the server.
Merged game updates from branch master, preparing to merge into master.
Merge branch 'master' into initial_demo_merge using --strategy=ours to
ignore all changes from master.  This is in preparation for "moving" the
master branch to this branch.