Build on new machine
Merge branch 'master' into parse

Conflicts:
	coloradoconcerts/platforms/amazon-fireos/assets/www/index.html
	coloradoconcerts/platforms/android/CordovaLib/ant-build/build.prop

coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug-unal
igned.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts-debug.apk
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_
	coloradoconcerts/platforms/android/ant-build/ColoradoConcerts.ap_.d
	coloradoconcerts/platforms/android/ant-build/build.prop
	coloradoconcerts/platforms/android/ant-build/classes.dex
	coloradoconcerts/platforms/android/ant-build/classes.dex.d
	coloradoconcerts/platforms/android/ant-gen/R.java.d
	coloradoconcerts/platforms/android/assets/www/index.html
	coloradoconcerts/platforms/blackberry10/www/index.html
	coloradoconcerts/platforms/firefoxos/www/index.html
	coloradoconcerts/platforms/ios/www/index.html