added push notifications
Merge branch 'master' of https://github.com/gmumar/HackTheNorth

Conflicts:
	bin/classes.dex
	bin/classes/com/parse/starter/MainActivity.class
	bin/classes/com/parse/starter/ParseStarterProjectActivity$1.class
	bin/classes/com/parse/starter/ParseStarterProjectActivity.class
	bin/classes/com/parse/starter/R$id.class
	bin/classes/com/parse/starter/R$layout.class
	bin/classes/com/parse/starter/R$string.class
	bin/resources.ap_
	gen/com/parse/starter/R.java
	src/com/parse/starter/MainActivity.java
	src/com/parse/starter/ParseStarterProjectActivity.java
Merge branch 'master' of https://github.com/gmumar/HackTheNorth
pebble
Merge branch 'master' of https://github.com/gmumar/HackTheNorth

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ParseStarterProjectActivity.apk
	bin/classes.dex
	bin/classes/com/parse/starter/MainActivity.class
	bin/classes/com/parse/starter/ParseStarterProjectActivity.class
	bin/dexedLibs/Parse-1.6.0-1191df8f15a84c7afc58ce9307fad02a.jar
	bin/dexedLibs/Parse-1.6.0-4e79030f3cb622c34a6f5c167770e9ca.jar
	bin/dexedLibs/annotations-29684c93424192f9bd88df573d809667.jar
	bin/dexedLibs/annotations-47db92928caade1539e4e3ca4ec15516.jar
	bin/resources.ap_