hadiwij2 roh7: implement base template extension to registration page and login page
hadiwij2 roh7: fix indentations
Merge branch 'master' of https://github.com/uiuc-cms/uiuc-cs428-cms

Conflicts:
	cms/src/UiucCms/Bundle/UserBundle/Controller/DefaultController.php