upgrade rails to 4.0.2
add several columns to cspaces model
Fixed Merge conflict and merge branch 'master' of https://github.com/gmacie/civicspaces