okay uh
Merge branch 'master' of https://github.com/yukuan/rails-project
a few fixes and dox