Modification tinyMCE
Correction Gruntfile.js
Modification Caroussel
Modification tinyMCE and Caroussel
style="cursor:pointer;"
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html