Update August 27, 2013
- FIxed sub-menu in dashboard
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	assets/javascripts/ui.coffee