Add Map Element: Rock
Merge branch 'master' of https://github.com/raincole/isr

Conflicts:
	game/scene/scene_game.lua