is it appropriate ??
Merge remote-tracking branch 'origin/master'

Conflicts:
	eloket-resources/src/main/java/be/fedict/core/web/ApplicationInfo.java