code generator
abc
Merge branch 'master' of https://github.com/plansys/Plansys

Conflicts:
	protected/models/User.php