Various updates
Merge branch 'master' of https://github.com/noctare/RAIN

Conflicts:
	.gitignore