Merge branch 'master' of https://github.com/shaunthornburgh/clienttodo

Conflicts:
	src/CTD/AgencyBundle/Controller/HomeController.php
improve dynamic choices