Merge origin/master

Conflicts:
	LICENSE
Committing development branch stuff
Merge origin/master

Conflicts:
	LICENSE
Committing development branch stuff
Added unit testing and foselasticabundle
Merge origin/dev-master into dev-master

Conflicts:
	web/app_dev.php
Merge origin/dev-master into dev-master

Conflicts:
	web/app_dev.php

Committing Developer Branch app_dev and config files