Merge branch 'master' into royal
Merge branch 'develop' into royal
nbproject ignore
autocomplete
og_logo
Merge branch 'develop' into royal
Merge branch 'royal' into develop