Server3 conf change
Merge branch 'masterMerge' of https://github.com/simpleclicks/Thunderbolts-Repo into masterMerge