bump version and framework version
merge changes for OTRS 3.1.x
merge changes for OTRS 3.1.x