Merge branch 'hotfix/2.3.1' into develop
JARVIS-302 Added base tests
Merge pull request #5 from joola/feature/JARVIS-302

Feature/jarvis 302
JARVIS-319 Fixed issue with NaN on dashboard
Temp deploy changes.
Merge branch 'feature/JARVIS-319' into develop
JARVIS-320 Fixed issue with Other.
Merge branch 'master' into develop

Conflicts:
	package.json
	test/common.js
	test/mocha.opts
	test/unit/globals.spec.js
Added missing dep.
Changed coveralls target dir
Fixed for tests
Package update
Refactoring!!
Refactoring done.
Fixed package.json wrong git ref
JARVIS-343 prepare for release
Version bump 3.0.4
Removed joolaio bin from git
Fixed minor naming issues
Updated failing tests