Ignoring a bit more things
Merge branch '13.05-lido-view' of github.com:delving/culture-hub into 13.05-lido-view