Refactored the options page, create form type
Merge branch 'profile_refactor'

Conflicts:
	Symfony/src/Ace/UserBundle/Controller/DefaultController.php