Merge origin/master

Conflicts:
	nbproject/project.properties
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-gen/R.java.d
	platforms/android/CordovaLib/build.xml
	platforms/android/CordovaLib/proguard-project.txt
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/NorkartCordova-debug-unaligned.apk.d
	platforms/android/ant-build/R.txt
	platforms/android/ant-build/classes.dex.d
	platforms/android/ant-build/proguard.txt
	platforms/android/ant-gen/com/coolappz/NorkartCordova/R.java
	platforms/android/build.xml
	platforms/android/proguard-project.txt
	www/js/mapController.js
	www/templates/map-index.html
Merge origin/master