Update rails to 4.0.4
Merge branch 'master' of github.com:Genshin/gaku into prototype_person_edit