Enhancements in update_templates and delete_course commands
Merge branch 'master' of github.com:ldotlopez/edx-platform
Merge branch 'master' of github.com:ldotlopez/edx-platform
Merge branch 'master' of github.com:ldotlopez/edx-platform
UJI environment