Email Controller changed.
Merge branch 'master' of https://github.com/nemanja-tomic/Konteh