new assets n stuff
Merge branch 'master' of https://github.com/lafigueroa/RPGFoundation

Conflicts:
	RPGExplore/Library/ProjectSettings.asset
	RPGExplore/Library/expandedItems