changed conversations and reg new
Merge branch 'master' of https://github.com/maisaengineering/Addament