adding necessary default pictures, updating picture file locations
bringing branch up to speed with mirror branch from repo I am too lazy
and ignorant to deal with.
Merge remote-tracking branch 'origin/mvc_conversion' into mvc_conversion