updating my parse stuff
Merge branch 'master' of github.com:42entertainment/framework-app

Conflicts:
	app/assets/javascripts/parse_app.js