LQE-74 - Bunch of messages
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/controller/ListController.java