Merge branch 'release/20140130-0930'
Merge tag '20140130-0930' into develop

major enhancemends and bugfix unit items when word delete
fixes