Lots of formatting fixes
Merge branch 'master' of https://github.com/BathUniApp/bath-uni-app

Conflicts:
	src/ip7/bathuniapp/MainActivity.java
	src/ip7/bathuniapp/SettingsFragment.java
Oh dear god git what are you doing.