Re #1633 code format cleaning.
Merge branch 'master' of ssh://github.com/europeana/portal