update files.
Merge branch 'develop' of https://github.com/evantng/schoolfire into develop

Conflicts:
	Assets/RAIN/Editor/RAINSettings.asset