let the learn begin
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/models/user.json
	server/datasources.json
	server/model-config.json
let the learn begin