Bug 983392 - Added activities to main div, + grunt connect server and watch for dev
Removed server.js
Merge pull request #1 from k88hudson/t983392

Requesting a pull to fuzzyfox:master from k88hudson:t983392