Add steps emulation like a wizard

in real world may better use something like accordion componentt
Merge branch 'master' into HEAD

Conflicts:
	app/scripts/controllers/self-registration.js
	app/views/self-registration.html
Merge branch 'master' into HEAD
Fix JSON to return right number value