Merge remote-tracking branch 'origin/parse' into parse

Conflicts:
	SRTP_Try_Version_5/bin/ParseMain.class
	SRTP_Try_Version_5/bin/Requestor$1.class
	SRTP_Try_Version_5/bin/Requestor.class
	SRTP_Try_Version_5/bin/SearchInDb/SearchInDb.class
	SRTP_Try_Version_5/bin/SearchInDb/TestMain.class
	SRTP_Try_Version_5/src/ParseMain.java
	SRTP_Try_Version_5/src/Requestor.java
	SRTP_Try_Version_5/src/SearchInDb/SearchInDb.java
	SRTP_Try_Version_5/src/SearchInDb/TestMain.java
	SRTP_Try_Version_5/var/demoGraphDb/messages.log
	SRTP_Try_Version_5/var/graphDb/messages.log