Correction regex twitterDirective
Merge remote-tracking branch 'upstream/master'

Conflicts:
	frontend/.jshintrc
Merge pull request #1 from c-genest/master

Correction regex tweetDirective