Furhter work on MainActivity and MainFragment.
Merge branch 'master' of https://github.com/BrianFrederiksen/ITSMAP

Conflicts:
	Handin03/Handin03_grp11662/app/src/main/res/values/strings.xml