refactoring in progress
DDB-NEXT_CSS_refactoring bug fixed and general refactoring done
Merge branch 'DDB-NEXT_CSS_refactoring' into develop

Conflicts:
	application.properties