[bugfix] sorting of gallery files did not work as expected when displaying the gallery items backwards
Merge pull request #38 from cnlpete/release/3.0

[bugfix] sorting of gallery files did not work
Merge branch 'master' into 3.0
HTML entities for updating entries
Merge branch '3.0' into 3.1
More htmlentities to avoid bugs
Merge branch '3.0' of github.com:marcoraddatz/candyCMS-Core into 3.0
Update fancybox to newest version
Merge branch '3.0' into 3.1

Conflicts:
	assets/javascripts/core/jquery.fancybox.min.js
Merge should now work
Merge branch '3.1' into 4.0