added nav bar
uncommented stylesheets
changed some modal code
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
Merge branch 'develop' into vandiggelenj_sprint1
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
nav bar
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
registration modal
Splitting js/html/css, added map
Merge branch 'develop' of codeforge.cs.missouri.edu:swe-j into develop
modals
added and worked on about page
Merge branch 'vandiggelenj_sprint1' into develop
Added functionality to get all territory models.
Merge branch 'develop' into ahnera_sprint1

Conflicts:
	protected/views/layouts/registermodal.php
Added map.php file as a view, Redirect to map.php, navbar inverse
Merge branch 'bdbtzc_sprint1' into develop
Added URL rewrite for login, logout, map.
Fixed index page bug.