html
Merge branch 'development'

Conflicts:
	public/index.html
version 0.7
merged from master. up to date