update karma conf file
Merge branch 'master' of https://github.com/352Media/Mean

Conflicts:
	package.json
update karma config