Updated controllers
Merge branch 'master' of https://github.com/davealbert/HealthHackDublin2013-html