Added tests and grunt to build.
Merge branch 'master' into develop