Update controllers to protect from minification
Annotate services.  Remove markdown filter
Merge branch 'develop'