Terminals being loaded
Watering action begin implementation
Merge branch 'master' of https://github.com/fabiopicchi/spjam-catavento-2014

Conflicts:
	Source/Player.hx
	Source/StageState.hx
	Source/Terminal.hx