Merge branch 'master' into gh-pages
Instagram API changes
Instagram Changes
Instagram changes
Fixing JS
Commit fixes

Conflicts:
	android/assets/www/js/main.js
	ios/www/js/main.js