merged two-tier and resolved conflicts (kmap display and content submission is broken)
fixed botched merge with formats.py
merged with remote master
content submission now displays resources title; small cosmetic code changes