merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	mservice/wsgi.pyc
Merge branch 'master' of github.com:edizon/mservice

Conflicts:
	members/__init__.pyc
	members/models.py
	members/models.pyc
	members/serializers.py
	members/urls.py
	members/views.py
	mservice/__init__.pyc
	mservice/settings.pyc
	mservice/urls.py
	mservice/wsgi.pyc