Emergency commit, battery low
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/techteam/bashhappens/gui/activities/MainActivity.java