Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Saving master.. apparently my plugin files were pushed to the master even though i was on gh-pages branch..
Plugins did not install to ghpages branch.. so ran into a conflict when trying to merge views. Had to go back and manually update files on master so i can merge master into GH-Pages
Merge branch 'master' into gh-pages

Conflicts:
	Application/platforms/AVF-Android/android/assets/www/config.xml
	Application/platforms/AVF-Android/android/assets/www/index.html
	Application/platforms/AVF-Android/android/assets/www/js/main.js
	Application/platforms/AVF-iOS/ios/www/index.html
	Application/platforms/AVF-iOS/ios/www/js/main.js