Merge branch 'v4.3' of git://github.com/sourcefabric/Newscoop into v4.3
CS-5594: Adds versioning for js file
Merge pull request #915 from m038/CS-5594

CS-5594: Adds versioning for js file
trim author first and last name
Merge pull request #916 from ahilles107/v4.3

trim author first and last name
WOBS-3528: Fixes issue with TinyMCE converting special characters to html entities. Now encoding is set to raw.
Merge branch 'v4.3' of git://github.com/sourcefabric/Newscoop into v4.3
CS-5595 Proposed fix for missing image captions table in core SQL
Merge pull request #920 from m038/v4.3

V4.3
Merge pull request #921 from danielhjames/CS-5595

CS-5595 Proposed fix for missing image captions table in core SQL
Merge remote-tracking branch 'upstream/v4.3' into WOBS-3528

Conflicts:
	newscoop/admin-files/media-archive/editor_load_tinymce.php
	newscoop/install/Resources/sql/campsite_core.sql
	newscoop/js/tinymce/plugins/campsiteimage/popup.php