Commits 2/27
Merge branch 'assets2d' of https://github.com/USCrew/ascent into assets2d

Conflicts:
	ascent/Library/CurrentLayout.dwlt
	ascent/Library/expandedItems
	ascent/Library/guidmapper