modi build status
fix qunit tests
x
fix travis build statu image
Merge branch 'dev' into master

Conflicts:
	README.md
x