Merge origin/master

Conflicts:
	Ippocrate-war/src/java/utils/QuickPopulate.java