Forced commit
Merge branch 'master' of https://github.com/WPFerg/app-design

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/CordovaLib/ant-build/classes.jar
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk
	platforms/android/ant-build/HelloCordova-debug.apk
	platforms/android/ant-build/HelloCordova.ap_
	platforms/android/ant-build/HelloCordova.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/ant-build/classes.dex
	platforms/android/ant-build/classes.dex.d
	platforms/android/ant-build/dexedLibs/classes-33c870ebcc4133ef16e13fed7cfdf710.jar
Fixed Cordova popup bug and included JQuery.
Minor changes.
Merge branch 'master' of https://github.com/WPFerg/app-design
Centered login page correctly.
Centering of loginpage fix.

Conflicts:
	www/index.html