[WO-724] Optimise grunt build and watch tasks
* add grunt concat step before uglify
* split watch tasks for app and tests
Merge pull request #187 from whiteout-io/dev/WO-724

[WO-724] Optimise grunt build and watch tasks