Got rid of weather stuff
Merge remote-tracking branch 'origin/translator' into translator

Conflicts:
	app/src/main/java/org/techteam/bashhappens/SplashActivity.java
Merge happens