philippeop Merge remote-tracking branch 'upstream/master' into tiles

Conflicts:
	inventory_ui.cpp
	newcharacter.cpp

Latest commit 9e49597

Mar 11, 2013