fix watch in gruntfile
Merge branch 'dev' into feature/isValidDate
fixing whitespace