deploy and group management

* add testing environments to deploy
Merge branch 'develop' of github.com:china-east-soft/YPortal into develop

Conflicts:
	app/views/wifi/merchants/home.html.erb
	app/views/wifi/users/login.html.erb