added UserSettings.php and MainTemplate.html
Merge branch 'master' of https://github.com/OKTech/test