fix #646 define scope of variables
define the inferred type of control structure variables
Fix #693
Merge branch 'master' into remodel

Conflicts:
	en/modules/statementblocks.xml
	src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java