prepared for OpenID
Merge branch 'dev' of git://github.com/ConPaaS-team/conpaas into dev