Ajout conf frontend
Merge remote-tracking branch 'upstream/master'

Conflicts:
	frontend/.jshintrc