Merge tag '20140130-0950' into develop

fixes
add to u only if t
enhancements
filtr
unit items
finished unit items enh. modeling
clean up
variants
learn
icons
can switch
Merge branch 'feature/unititems' into develop
Merge branch 'release/20140130-1935'