Attempt++ , conf changes
Merge branch 'masterMerge' of https://github.com/simpleclicks/Thunderbolts-Repo into masterMerge