Merge branch 'release/V20130123'
Merge branch 'release/V20140123'
Merge branch 'master' of github.com:starteam/starx into develop

* 'master' of github.com:starteam/starx: