Merge origin/master

Conflicts:
	EESSBackend/nbproject/project.properties
	EESSBackend/src/conf/Values.sql
Merge origin/master
Merge origin/master

Conflicts:
	EESSBackend/nbproject/project.properties
	EESSBackend/src/conf/Values.sql
Merge origin/master

Conflicts:
	EESSBackend/src/conf/Values.sql