Merge branch 'master' of https://github.com/aerospike/eclipse-tools.git

Conflicts:
	aerospike-site/artifacts.jar
	aerospike-site/content.jar