no double members, desktop btn
Merge branch 'master' of https://github.com/lrnzzz/xmix

Conflicts:
	server/laravel4/app/controllers/MemberController.php
	server/laravel4/app/controllers/Presentcontroller.php
	server/laravel4/app/controllers/UserController.php
	server/laravel4/app/views/members/index.blade.php
	server/laravel4/app/views/party/login.blade.php
	server/laravel4/app/views/party/profile.blade.php
	server/laravel4/app/views/party/register.blade.php