Merge pull request #3 from michaelkuty/develop

Develop
cleanup
Merge remote-tracking branch 'tcpcloud-group/develop' into develop
fix missed template