fix up merge
added signup app
wip UserModelWithPassword
wip signup app
Merge branch 'master' into feature/signup

Conflicts:
	lexicon-server/src/models/mapper/MapperListModel.php