build changes
Merge branch 'master' of https://github.com/aphalak/Partysculture

Conflicts:
	.idea/workspace.xml
	platforms/android/CordovaLib/ant-build/build.prop
	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/build.prop
	platforms/android/ant-build/classes.dex
	platforms/android/ant-build/classes.dex.d