Merge branch 'master' of git://github.com/alexeevdv/falltergeist

Conflicts:
	src/States/InventoryState.cpp
Merge branch 'master' of git://github.com/alexeevdv/falltergeist

Conflicts:
	src/States/InventoryState.cpp
fixed segfault invoking InventoryState with empty hand
Merge pull request #102 from vvbalashoff/master

fixed segfault  invoking InventoryState with empty slots