Merge proposals dependent on lp:~programmer-py/markitzero.us/dev

lp:~programmer-py/markitzero.us/dev has no merge proposals.