paginate
paginate
fix bug #158

http://localhost:3000/admin/auth_message
update deploy file, add auth_message to /shared directory
and change permission to write.
fix bug #160  admin can not delete agent

add agent_id to merchants table
change message to users

/wifi/users/login_success
Merge branch 'develop' of github.com:china-east-soft/YPortal into develop
add merchant added time to terminal
landing adv
current landing ad
current landing ad
Merge branch 'develop' of https://github.com/china-east-soft/YPortal into develop
current landing
layout js
layout js
landing adv
fix bug  terminal added time
Merge branch 'develop' into kaminari
fix bug #159 and #162, those two bug are relative

add agent_info to agent when it is  initialize
and fix indent error of config/locale/zh-CN.yml
kaminari paginate
Merge branch 'develop' of https://github.com/china-east-soft/YPortal into develop