add Bootstrap and twitter connect OK
Security changes for Oauth
git ignore .idea
Merge remote-tracking branch 'origin/dev' into feature-planned-tweets

Conflicts:
	.gitignore
	app/AppKernel.php
	app/config/config.yml
	app/config/routing.yml
	app/config/security.yml
	composer.json
	composer.lock
	src/JB/UserBundle/JBUserBundle.php
	src/JB/UserBundle/Resources/config/services.yml