Broken tasks routes. Router is halfway through over haul
Merge branch 'origin/develop'

Conflicts:
	App/Controller/AboutController.php
	App/Controller/ContactController.php
	App/Package/Task/Controller/HeadController.php
	App/Package/Task/TaskRouter.php
	App/Router.php
	App/View/Template/nav.html
Dynamic Nav Set Up
Route reverted to old page location names.
Merge branch 'origin/master'
Nav now works inside Tasks Package
View Templating fix inside Tasks
View Templating fix inside Tasks
Merge branch 'origin/develop'

Conflicts:
	App/Controller/LoginController.php

Adding in Stephen's Navigation, drop down menus still need to be implemented
Adding in Stephen's Navigation, drop down menus still need to be implemented
Merge branch 'origin/develop'

Conflicts:
	App/View/Template/nav.html
Added in a simple hack/fix to Task. Everything still needs to be tested, but it all seems to be working.
Merge pull request #27 from HexagonSystems/develop

Major changes