fix spans for if expressions, fixing IDE bugs #503
I prefer this fix to #1143, but thanks anyway @lucaswerkmeister
Merge branch 'master' into let

Conflicts:
	Ceylon.g