Updated gruntfile so that instead of typing "grunt connect:server:keepalive" for a development server, a developer can just type "grunt server".
Merge branch 'develop' into topic-groups