Added BraincraftedBootstrapBundle
Added blueimp / jQuery-File-Upload
added in user construct parent construct
Merge branch 'develop' into write-fixtures

Conflicts:
	app/AppKernel.php
	composer.json
Merge pull request #21 from geekhub-php/fix-user-construct

Fixed User constructor
Merge branch 'develop' into write-fixtures
Merge branch 'develop' into write-fixtures

Conflicts:
	app/AppKernel.php
	composer.json