merge devgeoff with master to update photo and logo paths