fix the bugs on sms cron
site cotroller
user profile
fix on layout
Merge branch 'Ren'
fix the conflict
homepage edits
Merge branch 'master' of github.com:junereycasuga/emerge
fix on login and registration
merge
fix on site controller
Merge branch 'master' of https://github.com/junereycasuga/emerge
graphics
hime page
agency
push mo yan!
push ko ulit
Merge branch 'master' of github.com:junereycasuga/emerge
Merge branch 'master' of github.com:junereycasuga/emerge
routing