Services
Merge remote-tracking branch 'origin/translator' into translator

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