registration of user complete
Merge origin/master

Conflicts:
	server/application/controllers/api.php