remove merge conficts
Merge branch 'master' of github.com:Zwooosh/MT-Identity