Auto Update 05172014_233001
update
Merge branch 'master' of github.com:tongelja/work-nk_lc
Auto Update 05192014_233001