Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/hackru2014f/friendcast/MainFragment.java