refactored image loading and material adapter
Merge branch 'master' of github.com:scholt/TeachingApp