bugfix for type in templates for user param; added environment support for supervisord.conf
Merge branch 'develop'