change to 1.0 development
change display method for "material" tab
bug fix for last commit
Merge branch 'develop'

Conflicts:
	index.html
change to 1.0