Reset Commit
Merge branch 'master' of github.com:cknaut/babank

Conflicts:
	advisors/models.pyc