updated
updated.
updated templates
updated registration module
Merge branch 'origin/0.4'

Conflicts:
	composer.json