Merge branch 'hotfix/v1.0.2013052801' into develop
Merge branch 'hotfix/v1.0.2013052802' into develop
mail if error has ocurred
fix for site update
added ym option
Merge branch 'feature/fix-for-mysoftbank-update' into develop
Merge branch 'release/v1.1.2013092101'