10/14/2014 sprint-21 review

commit the bug fix for updater