first
second
Merge branch 'master' of https://github.com/angelfna/new_man

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	adminManage/views.py
	customer/models.py
	man_group/settings.py
	man_group/settings.pyc
	man_group/urls.py