App now does not immediately go to chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
	app/src/main/java/yhack2014/artroom/MainActivity.java