Merge branch 'indev'

ShadowNinja

2013-07-08 19c9a0443b17176a27329b69ee16fe28d7be6fd8

technic/solar_panel_mv.lua does not exist in tree 9125c9ca38798426a1bf01a247e98bb532ec9b6b