Fixed BeerPriceSelection Bug
Merge remote-tracking branch 'origin/master'

Conflicts:

	OSMPubGuide-WS/src/java/de/ifgi/ohbpgiosm/database/EventDatabaseConnector.java
Merge remote-tracking branch 'origin/master'

Conflicts:

	OSMPubGuide-WS/src/java/de/ifgi/ohbpgiosm/database/EventDatabaseConnector.java
Merge
Merge remote-tracking branch 'origin/master'