registration separate url and templates
Merge remote-tracking branch 'origin/master'