Re #880 Code format changes here and there.
Merge branch 'master' of ssh://github.com/europeana/portal