deprecated note
message
Merge branch 'hosted' of github.com:guancio/ChromeOsSubtitle into hosted

Conflicts:
	webapp/appcache
	webapp/index.html