Merged fixes

Refer to CHANGELOG.md for changelog ;)
Merged new pull requestes

Refer to CHANGELOG.md
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	javascript/dropdown.js