models update
Merge branch 'master' of https://github.com/tanisjihanis/bluebeary

Conflicts:
	app/__pycache__/models.cpython-34.pyc