Merge branch 'master' of github.com:VEINHORN/smartregistration
Merge branch 'master' of github.com:VEINHORN/smartregistration