clearing stuff
Merge branch 'master' of github.com:malavbhavsar/mitra

Conflicts:
	server/app/views/services/index.html.erb