Merge PR #2163 - Makefile updates
Merge PR #2162 - Fix breaking waits
Merge PR #2161 - Autopickup inventory option
Merge PR #2146 - Mutation loss category balance
Merge PR #2079 - Skill book focus rebalance
Merge PR #2049 - CBM:Uncanny Dodge

Conflicts:
	monattack.cpp
	monmove.cpp
Added alarm-clock flag to wrist watch and cell phone.
Added watch flag to cell phones and powerarmor helmets.
The watch flag item will also work if it is in the inventory.
Added the ability to set an alarm with an alarm-clock item in the sleep screen.
Traits like Heavy Sleeper, Bad Hearing and Bionic Ears have an effect on hearing the alarm.
Waiting can now be canceled with the "wait a turn" key (. of 5).
Waiting without a watch item has different options now.
UIMENU popups can be closed with ESC.
New player function has_item_with_flag(string).
New inventory function has_flag(string).
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into time_clock

Conflicts:
	game.cpp
Add a string_format function to avoid too many temporary char buffers. Add translation support for melee and melee styles.
Edit itypedef.cpp, adjust translation strings.
removed unmerged variables
Added onion and carrot.
Add translation support for npcmove.cpp. Other minor fix to translation strings.
Update pot file
update GitIgnore + CodeBlocks project
Fix bug with smoke.

When caching stuff, always make sure the stuff isn't modified while you have it cached! =)
Merge remote-tracking branch 'upstream/master'
Option to hide cursor for WinGDI (too)

And some cleanup
Use look_around() to choose headlight facing direction instead of a menu.
Added onions and carrots to spawn groups.