Service edit, etc
Merge branch 'master' of https://github.com/malavbhavsar/mitra
Adding service controllers