update
update
Merge branch 'master' of github.com:edizon/mservice

Conflicts:
	.pydevproject
	members/__init__.pyc
	members/models.pyc
	mservice/settings.pyc