Bux fixed
Merge branch 'master' of github.com:ssouporg/ssoup-dev