update
Merge branch 'develop' of https://github.com/Nate-McNeil/BizManage into develop

Conflicts:
	frontend/app/bower_components/bootstrap/less/bootstrap.less
	frontend/app/bower_components/bootstrap/less/mixins.less
	frontend/app/bower_components/bootstrap/less/theme.less
Fixed routing issues