new theme
template update
Merge branch '2.1' of https://github.com/thexerteproject/xerteonlinetoolkits into 2.1
last changes in new template