Merge branch 'hotfix/v1.0.2013052802'
Merge branch 'release/v1.1.2013092101'
fix link
Merge branch 'hotfix/fix-link' into develop