fix the location data
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
aaa
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell

Conflicts:
	anbels/Admin/Controller/AccountManagementController.class.php
	model.py
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
Merge branch 'master' of https://github.com/LamCiuLoeng/anbell
add the plan and course function