merge
merge
Merge branch 'dev' of https://github.com/sguergachi/AuroraGameHub into dev

Conflicts:
	src/aurora/V1/core/screen_ui/DashboardUI.java