Merge pull request #3 from CleverRaven/master

yep, kinda sure this get the latest into my repo
Merge pull request #4 from CleverRaven/master

Update
non flashing help-menu. silently ignores illegal keys
accounts for item.charges when dropping items.
fix complete; forgot to have it check item.count_by_charges()
mapsharing implementation with new code base
re-implemented locks for saving + fixed a bug in the main menugit add src/main_menu.cpp! (now you have to pull it)
fixed up a fail in mapbuffer.cpp
locking for save files is now really finished (now you should pull, pleeeeaaase)
added the setup tool for servers
added --configdir cli option and made default char name be empty when not sharing (now it's definitely finished, no more commits. it can be pulled :p)
Merge pull request #5 from CleverRaven/master

Update
put FILENAMES and related functions into own namespace (how it should be with all globals), and fixed the cli options. Now it REALLY should be finished ^^
Merge branch 'input-manager-editmap.cpp' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-input-manager-editmap.cpp
forgot some locking code in savegame.cpp and worldfactory.cpp
Merge remote-tracking branch 'KA101/master' into FrankenMod
No more wielding arrows on pickup
dupe removed from mod's jason
Merge remote-tracking branch 'MattAmmann/autoquiver' into FrankenMod
Merge remote-tracking branch 'cSep/emodjsonfix' into FrankenMod