forms
Merge branch 'jl/phonegap' of github.com:jlarusso-canvas/aap into jl/phonegap

Conflicts:
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphoneos/CordovaLib.build/CordovaLib.dep
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphoneos/CordovaLib.build/Objects-normal/armv7/libCordova.a
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphoneos/CordovaLib.build/Objects-normal/armv7s/libCordova.a
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphoneos/CordovaLib.build/build-state.dat
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/CordovaLib.build/CordovaLib.dep
	aap-ipad/platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/CordovaLib.build/build-state.dat
	aap-ipad/platforms/ios/build/Aerial.build/Debug-iphonesimulator/Aerial.build/Aerial.dep
	aap-ipad/platforms/ios/build/Aerial.build/Debug-iphonesimulator/Aerial.build/build-state.dat
	aap-ipad/platforms/ios/build/device/libCordova.a
	aap-ipad/platforms/ios/build/emulator/Aerial.app/Aerial
	aap-ipad/platforms/ios/build/emulator/Aerial.app/www/index.html
	aap-ipad/platforms/ios/build/emulator/libCordova.a
	aap-ipad/platforms/ios/www/index.html
	aap-ipad/www/index.html
	public/assets/application-7b59d413c73be9be7f6873e4b5a987bd.js.gz
	public/assets/manifest-76b19047dd8ed328048996e082538352.json
	public/assets/manifest-bcbf2ba2795f9cb777999e8e2c0ccf56.json
	public/assets/manifest-f70ae02bbe8a23d103afc94d8e283423.json