007
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev

Conflicts:
	GameJam2013/Assets/Flash/ProgressPanel.as.meta
levelGEn
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev

Conflicts:
	GameJam2013/Assets/Scripts/Utilities/LoopScale.cs
level generator for real
Merge branch 'dev' of git@github.com:danielkinjerski/GameJam2013.git into dev