Merge branch 'ImprovedReflection'
Merge branch 'master' of https://github.com/edwinb/Idris-dev
Fix for conversion methods in the Java backend
Fix wrong result type for idris_peek in Java
Merge pull request #334 from JanBessai/master

Some fixes related to typeconversion in the Java backend