New map functionality
Merge branch 'master' of https://github.com/andreasellervee/EMMtarkvaraprojekt

Conflicts:
	projekt/AndroidManifest.xml
	projekt/res/layout/fragment_info.xml
	projekt/res/values/strings.xml
	projekt/src/com/ee/matkarakendus/fragments/InfoFragment.java