Small refactoring of the non-class file copying
Merge branch 'avian-droid-2' of https://github.com/bigfatbrowncat/avian into avian-droid-2

Conflicts:
	makefile
Resolved using my changes
Fixed .properties publishing and patching