register

register
Merge remote-tracking branch 'origin/feature/homepage' into feature/homepage

Conflicts:
	api/controllers/AuthController.js
	api/services/protocols/local.js
Merge branch 'feature/homepage' of https://github.com/uccor/labit into feature/homepage