Update from SF.

* Roles
* ProjectModel (merged)
* UserModel
* Tests
wip: ng projects page
Merge branch 'master' into projectuser
wip: user projects list
Merge remote-tracking branch 'origin/master' into projectuser

Conflicts:
	lexicon-server/src/angular-app/common/js/services.js
	lexicon-server/src/controllers/app.php
	lexicon-server/src/controllers/base.php
	lexicon-server/src/models/ProjectModel.php
	lexicon-server/src/models/commands/LinkCommands.php
	lexicon-server/src/models/rights/Domain.php
	lexicon-server/src/models/rights/Roles.php
	lexicon-server/src/service/lf.php
	lexicon-server/src/views/angular-app.html.php
wip: projects