Fragments, maps and lists
Merge branch 'master' of https://github.com/jennynilsson/Living

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/layout/main.xml
	res/values/strings.xml