kill weather rotation
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/fl/developer/teleproject/MainActivity.java
weather_header