type on index.html
Merge commit '881a893859640113c953267d4bbfa01790aa6924'
Merged Mbseid and Altivan's changes.
Merge commit '71220d3a1e4bfda9e14276cdf039c25557436efa'

Conflicts:
	prismbutton.js