ASD
Merge branch 'juhani' of https://github.com/JuhaniImberg/jgj2013 into kivi

Conflicts:
	MatkaUlosLaatikosta/assets/test_map.txt
	MatkaUlosLaatikosta/src/jgj/engine/Map.as
waiting for jukkeri
Fixed conlict + new animations
Fixed conlict + new animations
Merge branch 'juhani' of https://github.com/JuhaniImberg/jgj2013 into kivi

Conflicts:
	MatkaUlosLaatikosta/src/jgj/engine/Player.as
stuff
Waiting for juhani
Merge branch 'juhani' of https://github.com/JuhaniImberg/jgj2013 into kivi

Conflicts:
	MatkaUlosLaatikosta/src/jgj/engine/Blob.as
paiva ohi
New main menu
json loading
Triggers, omg
Main menu and bg
Merge branch 'juhani' of https://github.com/JuhaniImberg/jgj2013 into kivi

Conflicts:
	MatkaUlosLaatikosta/src/jgj/engine/Blob.as
	MatkaUlosLaatikosta/src/jgj/engine/Map.as
Mahdollisia muutoksia
juttuja
credits, box pulling
new tiles
Merge branch 'juhani' of https://github.com/JuhaniImberg/jgj2013 into kivi

Conflicts:
	MatkaUlosLaatikosta/src/jgj/engine/Player.as