Added to BaseKit Bootstrap
Merge branch 'develop' of https://github.com/basekit-templates/tdk into develop