Hack to prevent FK/PK from being removed from list query with 'include
in query' element setting.
Merge branch 'master' of ssh://github.com/Fabrik/fabrik
Improving comment on previous commit for PK/FK list query includes.
Merge branch 'master' of ssh://github.com/Fabrik/fabrik
fixed: cdd filter if in joined group was not working, improved listmodel::getColumnData to allow for passing in where statement to filter results
checkbox element with checkbox filter - should now work
Update string.php

iconv() returns an empty string on some MAMP platforms.  Bypass iconv() as required.
Merge pull request #791 from PtrNrs/master

iclean(): Bypass call to iconv() if necessary
refractored randomize filename (fileupload) into parent adaptor classes and made it so that min # of randow chars is 6 and it replaces rather than appends to the file name
Creating groupoutro
adding own class to group outro
+ removing some files created once earlier by mistake
Added group outro to language files (Estonian and French translated, English in others)
Merge pull request #794 from jaanusnurmoja/groupoutro

Adding group outro
Fix for French translation

Group outro label's translation was written in wrong line
Merge pull request #796 from jaanusnurmoja/groupoutro

Fix for French translation
fixed: php error in tabs template from last commit
changed: dbjoin and cdd element, replace concat label with concat_ws - allows for NULL values in concat values
fixed list js code for getRow()
Merge branch 'master' of ssh://github.com/Fabrik/fabrik
Adding group repeat max of 0 for Troester