TICKET-1234 - usefull commit message
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	js/plugins.js
TICKET-1234 - usefull commit message