fix up loading flash, @TODOs
Merge branch 'master' of github.com:patrickarlt/coffeetime-app