Merge branch 'master' into development
improvement
Merge branch 'development' of https://github.com/vraffael/redmine-1.4-customization