Fix to join and CDD element getJoinLabelColumn() so we cache it if it's
a concat, which we weren't doing before, and for some reason, in search
all, we ended up using the CONCAT on the first time through, and the
non-CONCAT element selection on the second.  Also renamed GetValColumn()
to getLabelOrConcat(), because that's what it does.  :)
Merge branch 'master' of ssh://github.com/Fabrik/fabrik

Conflicts:
	plugins/fabrik_element/databasejoin/databasejoin.php