Small parsing fixes.
Merge branch 'master' of github.com:bjornorri/iSchool-Android