Added grunt server task
Merge branch 'develop'