Merge branch 'master' of https://github.com/sanshar/Block
Merge branch 'master' of https://github.com/sanshar/Block

Conflicts:
	dmrg_tests/runtest