Changes regarding node_modules folder.
Merge branch 'master' of https://github.com/WPFerg/app-design

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/CordovaLib/ant-gen/R.java.d
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk.d
	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.d
	platforms/android/ant-gen/R.java.d
Created base media folder.
Merge branch 'master' of https://github.com/WPFerg/app-design

Conflicts:
	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
Basic media additions.