merge jkan
registration form
Merge branch 'jkan' into gugels
merge jkan