Merge branch 'hotfix/1.0.1'
Added the conditions back to the joined db template GetList()
Version bump.
Merge branch 'hotfix/1.0.2' into develop