#1392 Support for joining table more than once using alias and filter in add_component
Merge branch 'master' of https://github.com/liezl200/eden
Merge branch 'master' of git://github.com/flavour/eden
Several fixes, cleanup.
Disable weak unit test, cleanup component table aliasing, other fixes.