Better looking notifications
Merge branch 'master' of ssh://github.com/hackthenorth/hackthenorth-android

Conflicts:
	app/src/main/java/com/hackthenorth/android/receiver/GCMBroadcastReceiver.java