commit
Merge branch 'master' of https://github.com/inmate/radiance

Conflicts:
	.idea/artifacts/app_web_war_exploded.xml