Merge branch 'master' of https://github.com/bizzycola/ICBMComponent

Conflicts:
	build.gradle
	build.xml