added icons

The navigation bar no long
Merge branch 'master' of https://github.com/Glavin001/apps4halifax

Conflicts:
	view/main/start.html
Updating Maki Icons
Merge branch 'master' of https://github.com/Glavin001/apps4halifax

Conflicts:
	view/main/start.html