Replaced user system with FOSUserBundle
Merge branch 'master' of https://github.com/uiuc-cms/uiuc-cs428-cms

Conflicts:
	cms/src/UiucCms/Bundle/UserBundle/Controller/SecurityController.php
	cms/src/UiucCms/Bundle/UserBundle/Resources/config/routing.yml