minor changes
resolve conflict
Merge branch 'master' of github.com:mittmedia/mm_client_js
minor refactoring