fixes for ci script
Merge branch 'master' of github.com:mittmedia/mm_client_js

Conflicts:
	.gitignore