add -SNAPSHOT to version number
Merge remote-tracking branch 'origin/master'

Conflicts:
	geonetwork
updated to geonetwork with updated version numbers