20140620
Merge branch 'master' of https://github.com/prequiem/cbims

Conflicts:
	cbims/account/models/user.py