PAt's fixes
Merge branch 'develop' of https://github.com/thexerteproject/xerteonlinetoolkits into develop