Merging front-end.
Getting up to date with develop
Merge branch 'develop' of github.com:Nate-McNeil/BizMangage into develop

Conflicts:
	backend/backend/settings.pyc
	backend/bizmanage/models.pyc
resolving conflicts