Fix misplaced break.
Merge branch 'master' into cpp11
Merge branch 'cpp11' into shared_ptr
Store map entities in shared pointers.

Not done yet for tiles and for the hero.