before pulling
Merge in Kain's branch
Merge branch 'master' of https://github.com/tianxind/cpwiki
fixed problems with user sign in on cp show page