revised file loading mechanics to support dependencies on instances
Merge branch 'master' of https://github.com/scalio/liger-prototype
comitting temporary multi-patch code to allow merge
Fixes to loading and references.  Also contains merge: branch 'master' of https://github.com/scalio/liger-prototype

Conflicts:
	lib/src/main/java/scal/io/liger/JsonHelper.java
Merge branch 'master' of https://github.com/scalio/liger-prototype

Conflicts:
	lib/src/main/java/scal/io/liger/JsonHelper.java
	lib/src/main/java/scal/io/liger/MainActivity.java