fixed hard-coded working directory
Merge branch 'master' of https://github.com/rhokinbraam/peer_marker.git

Conflicts:
	db/development.h2.db
new transformer