Merge branch 'hotfix/v0.1.2012121501'
multiple addresses
Merge branch 'release/v1.0.2013052701'
address book setting
Merge branch 'hotfix/v1.0.2013052801' into develop