change templates
change templates\
change templates\
Merge github.com:anirama/semio

Conflicts:
	project/itclaim/templates/semio_muz/select.html