pictures for a pub
resolve conflict
Merge branch 'master' of https://github.com/Jer--/MyPub.git

Conflicts:
	grails-app/views/pub/show.gsp