Finished linking and fixed some data
Merge branch 'master' of https://github.com/SKoen/BRUNSWICK-GREEN

Conflicts:
	js/app/controllers/mainController.js