registration conflict problem solved
Merge branch 'master' of https://github.com/infotechnab/smartaservice