Merge branch 'release-0.3.2' into develop
This is temporary; baph should not have any references to 'whitelabel' anywhere
calling configure_mappers here can break things
whitelabel removal, initial commit of swappable models (Organization and Group)
.
swappable user model, whitelabel references completely removed
transition vars removed, plus a fix for Model sometimes being an unevaluated lazy reference
BACKWARD INCOMPATIBLE! permission system complete overhaul + some optimizations
Merge pull request #10 from dieselmachine/latest

Latest
Merge branch 'release-0.3.3' into develop

Conflicts:
	VERSION
Fixes for missing templates and fixtures?
Testing another fix
Another fix
Another update
Adding txt files to the manifest for email subjectlines
Merge branch 'release-0.3.4'

Conflicts:
	VERSION