Changes to templates and minor bugs fixes when registering resolved
Merge branch 'master' of github.com:leifos/ifind
fixed a errors from commit by sean.