really confused.
ugh.
Revert 878d6db..832b758

This rolls back to commit 878d6db26f66fadd80ff716830dc3a5a8931c75c.
ios plugin issue fixed?
no bugs, no errors… features just wont fire on ios……
Android fully functional with mash-ups. For whatever reason iOS not firing.
Mash up and native features perfectly working. iOS still being a pain.
forgot to setup a gh-pages
Merge branch 'master' into gh-pages

Conflicts:

Application/platforms/android/bin/dexedLibs/cordova-3.0.0-7cdaeb61fe6feb
793117b1be680f654f.jar
	Application/platforms/android/bin/resources.ap_
	Application/platforms/android/bin/workApp.apk
	Application/platforms/ios/workApp.xcodeproj/project.pbxproj

Application/platforms/ios/workApp.xcodeproj/project.xcworkspace/xcuserda
ta/ShaunThompson.xcuserdatad/UserInterfaceState.xcuserstate
	Application/platforms/ios/workApp/config.xml
	Application/platforms/ios/www/js/main.js