More work on Manager
Merge branch 'master'

Conflicts:
	buscompany/forms.py
	db.sqlite3