change
Merge branch 'master' of https://github.com/sigepijiang/apollo

Conflicts:
	apollo/templates/admin/floor_layout.html