setup inline editting
test login design
resolve mergeconflicts with inlineeditting
viewer design, clean out salespage