* fixed gruntfile to execute Karma from grunt (grunt test-karma)
Merge remote-tracking branch 'github/development' into development