Removed debug code
Corrected buttons
code formatting
Resolved conflict
Merge branch 'master' of https://github.com/NaturalHistoryMuseum/ckanext-gallery