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

Conflicts:
	nbproject/private/private.properties