Merge branch 'release/2013.05.10'
redmine#91
redmine#96
Merge branch 'hotfix/redmine#96'
Merge branch 'hotfix/redmine#96' into develop
Merge branch 'hotfix/redmine#97' into develop
redmine#92
redmine#93
redmine#94
redmine#94
Merge branch 'feature/redmine#94' into develop