IDEA control files
cleaning up git
Merge branch 'master' into develop

Conflicts:
	.idea/artifacts/Gradle___uk_q3c_krail_testbench___testbench_0_5_war.xml
	.idea/artifacts/Gradle___uk_q3c_krail_testbench___testbench_0_5_war__exploded_.xml
	.idea/artifacts/Gradle___uk_q3c_krail_views___views_0_5_war.xml
	.idea/artifacts/Gradle___uk_q3c_krail_views___views_0_5_war__exploded_.xml
	.idea/modules.xml
cleaning up git