rename controller
rename controller
fix conflict
add multi language,css change
Merge branch 'staging' of github.com:finleyltf/FusionSquare into 2-reservation
remove dajax ,fix link delay bug
conflict fix
Merge branch 'staging' of github.com:finleyltf/FusionSquare into 2-reservation