Commit fra Lundemo hoveddata
Merge origin/master

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/CordovaLib/ant-build/classes.jar
	platforms/android/CordovaLib/ant-gen/R.java.d
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/NorkartCordova-debug-unaligned.apk.d
	platforms/android/ant-build/NorkartCordova.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/ant-build/classes.dex.d
	platforms/android/ant-gen/R.java.d
	platforms/android/assets/www/index.html
	platforms/android/assets/www/js/AddressController.js
	platforms/android/assets/www/js/app.js
	platforms/android/assets/www/js/mapController.js
	platforms/android/assets/www/js/services.js
	platforms/android/assets/www/lib/js/ngAutocomplete/ngAutocomplete.js
	platforms/android/assets/www/templates/about.html
	platforms/android/assets/www/templates/map-index.html
	platforms/android/assets/www/templates/ras.html
	platforms/android/assets/www/templates/tabs.html
	www/index.html
	www/js/AddressController.js
	www/js/mapController.js
	www/js/services.js
	www/lib/js/ngAutocomplete/ngAutocomplete.js
	www/templates/map-index.html
	www/templates/ras.html