Merge branch 'master' of git://github.com/allencct/Dvorak

Conflicts:
	content/command_center.php