backup/import function
Merge branch 'develop'

Conflicts:
	index.html
change to v0.5