Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changed file for heroku only
postgresql
source
changed
change again
pg
update README with heroku deploy
fix the problem of login
update the readme
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into production
update gem
Merge remote-tracking branch 'cms_6bey/master'
Merge branch 'master' of github.com:mistbow/cms_6bey into production
update gem
Merge remote-tracking branch 'upstream/master'
fix the bootstrap problem
fix strap