Add login and registration on client and add some logic
merge
Merge branch 'master' of https://github.com/justplay1/hackathon

Conflicts:
	Hackathon/bin/AndroidManifest.xml
	Hackathon/bin/R.txt
	Hackathon/gen/com/actionbarsherlock/R.java
	Hackathon/gen/com/hackathon/R.java
	Hackathon/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	Server/.idea/workspace.xml
	Server/routes/core_server_routes.js
	sliding_menu_library/bin/sliding_menu_library.jar