KutsuplusSupportMapFragment
Merge branch 'master' of https://github.com/Saku2/KutsuPlus-android

Conflicts:
	kutsuplusproject/src/fi/aalto/kutsuplus/MainActivity.java