A combination of changes
Merge branch 'master' of https://github.com/atif089/Rise2ShineWebsiteUI