fsdf
Merge branch 'master' of https://github.com/DavidSalzer/app110-android
asd
Merge branch 'master' of https://github.com/DavidSalzer/app110-android

Conflicts:
	platforms/android/CordovaLib/bin/app110-cordovalib.jar
	platforms/android/assets/www/index.html
	platforms/android/assets/www/js/dish.js
	platforms/android/assets/www/js/init.js
	platforms/android/assets/www/js/location.js
	platforms/android/assets/www/js/order.js
	platforms/android/assets/www/js/payment.js
	platforms/android/assets/www/js/server.js
	platforms/android/bin/app110.apk
	platforms/android/bin/resources.ap_
	platforms/android/res/xml/config.xml
	www/index.html