gh-pages commit before merging
Merge branch 'master' into slave

Conflicts:
	Application/platforms/AVF-Android/android/assets/www/js/main.js

Application/platforms/AVF-iOS/ios/AVFApp.xcodeproj/project.xcworkspace/x
cuserdata/ShaunThompson.xcuserdatad/UserInterfaceState.xcuserstate
finally fixed parse issue for instagram and refactored thesaurus API
Merge branch 'gh-pages'
resolved issue with ios jquery layout
still having some issues with app functionality on ipad - it works in browser & on emuator for android.. but does not work in ipad :(
:(
Whitelisting…. so that is what I have spent nearly 24 hours trying to fix. CSS will have to be wrapped up on Saturday, 1 day late. Wish phonegap came with clearer tutorials!! :(
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Still having emulator issues in SDK - found out I apparently hadn't updated my version in quite some time! Also fixed CSS styling for image resize / Responsive design
Merge branch 'gh-pages'
Android & iOS Responsive Design no longer glitching. All fixed.
Merge branch 'gh-pages'
Saving master.. apparently my plugin files were pushed to the master even though i was on gh-pages branch..