another BS merge
Merge branch 'master' of https://github.com/tronster/ggj2014

# By Shawn Freeman
# Via Shawn Freeman
* 'master' of https://github.com/tronster/ggj2014:
  Fixed some sounds not playing, fixed art scaling issue, fixed lvl 5 dogs not following correct path,

Conflicts:
	games/GameModule/bin/Katseye.swf