If else
Merge branch 'master' into x86

Conflicts:
	parser.y
Jump labels for if - else