Merge branch 'master' into win32-x64-working

Conflicts:
	src/mon.c

 Changes to be committed:
	modified:   DEVEL/Developer.txt
	modified:   dat/endgame.des
	modified:   include/patchlevel.h
	modified:   include/you.h
	modified:   src/mon.c
	modified:   src/sounds.c
	modified:   src/spell.c
	modified:   src/vault.c
	modified:   win/share/tiletext.c

diff --cc src/mon.c
index 19b6333f1a8384c9db639c901adb4f2de64de9a0,f73d258ecaddb379f1191e5715e548fd98a8a801..1ecbfd88ebacc5a8a2ad053fc013fa41ee59afbb
--- 1/src/mon.c
--- 2/src/mon.c
+++ b/src/mon.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        mon.c   $NHDT-Date: 1426470347 2015/03/16 01:45:47 $  $NHDT-Branch: derek-farming $:$NHDT-Revision: 1.140 $ */
+ /* NetHack 3.5        mon.c   $NHDT-Date: 1429584308 2015/04/21 02:45:08 $  $NHDT-Branch: master $:$NHDT-Revision: 1.164 $ */
 -/* NetHack 3.5        mon.c   $Date: 2012/05/16 02:15:10 $  $Revision: 1.126 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */