added grunt server task and fixed watch task
Merge pull request #114 from massiveart/feature/grunt

added grunt server task and fixed watch task