---- Maintenance branch {branch: mnt} ----
Fixed up spacing around concatenation operators
Code formating (alignment)
Added FOSUserBundle
- updated composer.json
- registered bundles in AppKernel
- updated framework translator
- updated fos_user setting in config.yml
- added routes
- added security

Added OrimUserBundle
- updated app/config/routing.yml
- registered in AppKernel
- added code to src/ folder
Added HWIOAuthBundle
Updated OrimUserBundle to support HWIOAuthBundle
Commented out AcmeDemoBundle configuration from AppKernel & routing_dev.yml
Ignoring parameters.yml

Conflicts:
	.gitignore
Added SonataAdminBundle
- Updated AppKernel
- Added sonata_block.yml
- Using sonata_block.yml in config
- Added SonataAdminBundle routes

Conflicts:
	app/AppKernel.php
SonataAdminBundle extras: simple_things_entity_audit
- Added simple_things_entity_audit.yml configuration
- Using simple_things_entity_audit.yml in config
Added SonataMediaBundle
Whole bunch of SonataMediaFiles
SonataMediaBundle: web/uploads folder
- added .empty file into web/uploads to keep folder in git
- Ignoring upload folder

Conflicts:
	.gitignore
Added phpunit.xml
Using FB & Google connect data from parameters.yml
Composer.json: using dev-master for hwi/oauth-bundle
Composer.json: using dev-master for sonata-project/cache-bundle
Added composer.lock
Ignoring phpunit.phar in root folder
Ignoring all do-*.sh shell scripts in root folder