Added twig.js to bower
Merge branch 'master' of https://github.com/concerto-cms/ConcertoCmsStandardEdition

Conflicts:
	bower.json