fix the bugs on sms cron
site cotroller
user profile
fix the conflict
Merge branch 'master' of github.com:junereycasuga/emerge