Merged #129 "Eliminate Wicket references from non-Wicket packages"
Treat .ico and .jpeg files as images
Merge branch 'ticket/202' into develop