Borked merge => fixed NB master branch needs bugfixes in order to work
Merge branch 'master' of github.com:/CMartinUdden/providence

Conflicts:
	app/lib/core/BaseModel.php
ca_users doesn't implement some functions ...