NOJIRA Minor style change
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/lib/core/BaseModel.php