Cleanup.
Cleanup merge.
Merge branch 'master' of github.com:nerdfiles/globaloilskills_com
Merge branch 'develop'
Merge branch 'develop'
Cleanup.