variables in switch
Merge branch 'master' into 1119
Merge branch 'master' into 1119
accommodate inline if/switch in #1119
Merge branch 'master' into 1119

Conflicts:
	src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java
bugfixes and tests for #1119
Merge branch 'master' into 1119