css UI update
Merge branch 'master' of https://github.com/uiuc-cms/uiuc-cs428-cms

Conflicts:
	cms/src/UiucCms/Bundle/UserBundle/Resources/views/Default/index.html.twig