some things
Merge branch 'master' of https://github.com/vienlemai/TaSoHa

Conflicts:
	app/views/admin/members/create.blade.php