Merge branch 'fossacs2013'

Conflicts:
	ars.v
	assertions.v
	axiomatic.v
	base.v
	doc/index.html
	expressions.v
	fin_maps.v
	memory.v
	smallstep.v
	state.v
	statements.v
	tactics.v