update1
Merge branch 'dev'

Conflicts:
	public/manifest.appcache
update
update
Merge branch 'master' into dev

Conflicts:
	public/manifest.appcache