fix turret activation use of wrong ammo
ignore the pointer to the menu window when it's NULL
fix item description
Move '$' symbol to beggining of the price
Merge branch 'inv' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-inv
Make robotfindkitten translatable
cleanup & astyle of robot-find-kitten files
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'item_description' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-item_description
Merge branch 'fix-ui-menu-window-crash' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-ui-menu-window-crash
Merge branch 'robot' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-robot
Merge branch 'fix-turret-ammo' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-turret-ammo
use BORDER_COLOR in functions for drawing lines
Merge branch 'lines' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-lines
fix corpse material appearing twice in item info
add message for ammo requirement of turrets
Merge branch 'fix-turret-ammo' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-turret-ammo
tighten grammar

Wasn't incorrect but wasn't necessary either.  Sorry.
Merge branch 'BevapDin-fix-turret-ammo'
Merge branch 'fix-double-material' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-double-material