Added 4 new entities to Manager front-end
Merge branch 'master' of http://github.com/ozen/cs353-project

Conflicts:
	buscompany/urls.py
	buscompany/views/manager.py
	db.sqlite3