Fixing QQ issue in update_col en-GB language
Back porting form article plugin fix for url safe aliases
Added safeQuote helper, which db vaue quotes an array of strings (or a
single string), and safeQuoted some keys in join element code.
Fixing merge conflict in article form plugin

Merge branch 'master' of ssh://github.com/Fabrik/fabrik

Conflicts:
	plugins/fabrik_form/article/article.php