Merge branch 'develop'
Image loading uses stb image
Merge branch 'master' into develop
Fixed some warnings