Merge branch 'master' of https://github.com/PqBenoit/ptp

Conflicts:
	app/assets/javascripts/application.js
Merge remote-tracking branch 'origin/master'