balanced/balanced-dashboard — pull request #1163 by cohitre (2014-04-16 19:58:16+00:00)
Title: sake-bomb-phase3 merge

This merges the #1115 branch and attempts to fix some merge conflicts regarding some routes.