Changed the way GlobalData works
Included missing file
Merge branch 'kandidatarbete' of github.com:Rovanion/AinAppen into kandidatarbete

Conflicts:
	src/gov/polisen/ainappen/MainActivity.java
Merge branch 'kandidatarbete' of github.com:Rovanion/AinAppen into kandidatarbete
Efter merge fixar