pull codes from kelvin
pull codes from kelvin
Merge branch 'master' of https://github.com/AmaniYunge/center_one

Conflicts:
	.idea/workspace.xml
admin page