Fixed error in html5 manifest escaping
Added timeout to AppCache.ensureUptodate() and refined error handling
Merge branch 'rebar-2.3' of github.com:bedatadriven/rebar into rebar-2.3