fixed compilation problems and general mess merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/king/apps/gamejam/blue/board/BoardBuilder.as
fixed compilation problems and general mess merging 2