CS-5446: Disabled 'add article_type' button if viewing all fields (with no article_type selected)
Merge remote-tracking branch 'upstream/master' into upstream_master
Merge remote-tracking branch 'upstream/master' into upstream_master
Merge remote-tracking branch 'upstream/master' into upstream_master
Merge remote-tracking branch 'upstream/master' into upstream_master
[CS-4762] Fixes missing Georgian file for jQuery datepicker
CS-5403 Fixes corruption in the Languages, Countries and LocationContents tables
Merge branch 'master' of git://github.com/sourcefabric/Newscoop
Merge pull request #794 from takeit/master

WOBS-1105 added dynamic block to editor_image.tpl
Merge branch 'master' of git://github.com/sourcefabric/Newscoop
CS-5446: Replaces putGS with translator
Merge pull request #796 from danielhjames/master

CS-5403  Character set corruption in master branch sample data
Merge pull request #790 from m038/CS-4762

CS 4762 & CS 5446
updated translation resources
updated translation resources
updated translation resources
updated translation resources
updated translation resources
updated translation resources
updated translation resources