Merge branch 'develop'
Merge branch 'master' into royal
welcome mestero
Merge branch 'royal' into develop
Merge remote-tracking branch 'origin/develop' into develop