coś
Merge branch 'server' of https://github.com/marekmagik/Wanderer.git into
server

Conflicts:
	Wanderer/src/pl/edu/agh/wanderer/dao/PostgresDB.java
	Wanderer/src/pl/edu/agh/wanderer/places/Places.java