merging
Merge branch 'master' of https://github.com/cezden/rpostgrexplorer

Conflicts:
	NAMESPACE
	R/relationships.R