Merce conflict
Merge branch 'master' of https://github.com/joepetrini/django-service-mgr