some commit added
some commit added
Merge branch 'master' of github.com:Yellowen/Faalis
scaffold_controller approved
Merge branch 'master' of github.com:Yellowen/Faalis