first draft of changes for cleaning up file loading and integrating expansion file handling
Merge branch 'master' of https://github.com/scalio/liger-prototype

Conflicts:
	lib/src/main/java/scal/io/liger/JsonHelper.java
second pass of expansion file integration, thumbnails and media loading fixed
Merge branch 'master' of https://github.com/scalio/liger-prototype
Merge branch 'master' of https://github.com/scalio/liger-prototype