bootstrap menu working again
webclient now has infinite scroll again
collages work with associated models again
Merge branch 'master' of github.com:ddsc/webclient