Some testing
Merge branch 'master' of github.com:eaudeweb/cms.themes

Conflicts:
	cms_theme/templates/forms/document/add.tpl.php
	twitter_bootstrap/templates/comment.tpl.php