Merge pull request #1 from twhnat/master

Added the DC registration information to the workshop page
Merge pull request #2 from twhnat/master

Added the doctoral colloquium page and changed links in the workshop page
Merge pull request #3 from twhnat/master

Added the doctoral colloquium page and changed links in the workshop pag...
Merge branch 'master' of github.com:rfdickerson/SenSys2014
made lots of Akos changes