update
Merge branch 'master' into dev

Conflicts:
	public/manifest.appcache
issue #20 #57
issue #61