Merge remote-tracking branch 'origin/master'

Conflicts:
	eProject_client/nbproject/private/private.xml

XML

xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e5c63046908551f8ab9091c3e381cbca5aa9f5eb.