fix address update bug
Merge branch '20131011' of https://github.com/victorgong/intimeprototype into 20131011