various changes
various changes, again

Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/expandedItems
	TeamBravoProject/Library/guidmapper