renaming routes and views
Merge branch 'master' of github.com:uiuc-cms/uiuc-cs428-cms
Merge branch 'master' of github.com:uiuc-cms/uiuc-cs428-cms

Conflicts:
	cms/app/config/security.yml
Merge branch 'master' of github.com:uiuc-cms/uiuc-cs428-cms