merge
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/CRUDController.js
merge
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/CRUDController.js
centered the navigation content in the topnav