added go to floormap fragment
Merge branch 'Find' of https://github.com/sandbergnilsvictor/MahAppStudent into Find
merging
merging ++
Merge branch 'master' of
https://github.com/sandbergnilsvictor/MahAppStudent

Conflicts:
	res/layout/itsl_list_group.xml
changes
still merging
icon and layout

changes to some icons and tweaks to layouts
icons updated
Merge branch 'Find3'

Conflicts:
	AndroidManifest.xml