Updated dependencies and grunt server task
WIP