commented out a puts in user_controller.rb that caused login error. fixed load bug on calendar when there is no bills
Merge branch 'master' of github.com:panjiw/Team-Player