include custom themes in theme selector
Remove condition on carrousel field
Merge branch 'develop' of git@github.com:WebTales/rubedo.git into develop
update for bootstrap source.
Merge branch 'develop' into 2.0dev

Conflicts:
	composer.phar