Merge branch 'master' of github.com:millesky87/Gamerproj
Merge branch 'style_update'
Merge branch 'master' of github.com:millesky87/Gamerproj into development
team commit