Merge branch 'release/RodgeRelease1.0' into development
Merge branch 'hotfix/RodgeHotfix' into development
New Feature
Create a conflict with KevinHotfix1
Merge branch 'feature/KevinFeature' into development
Build scripts, compiles but no tests
Added a passing test and adjust build script to point to test folder
Trying to create more conflicts. Add function returns string, new trace in a deleted file.
Merge branch 'feature/KevinFeature3' into development
Merge branch 'feature/KevinFeature2' into development

Conflicts:
	src/KevinFeature.as
	src/Main.as.REMOTE.20542.as
Merge branch 'release/KevinRelease1'