Merge remote-tracking branch 'origin/manfred' into dillon
dillon updates to some styles and stuff
Merge remote-tracking branch 'origin/dillon' into manfred
sell process