fixed scrollview
minor cleanup
Merge branch 'master' of https://github.com/Fortisque/anappleaday