Template clean up
Merge remote-tracking branch 'origin/develop' into develop
Remove obsolete tabs
Basic setting