abc
abc
abc
auto merge
Merge branch 'master' of github.com:github15693/rms

Conflicts:
	app/assets/javascripts/facilities.js
	config/routes.rb
Add Module Condo Info
Add Module Condo Info
Add Condo-Info and conflict
Commit before megre
Commit before megre
Merge branch 'master' of github.com:github15693/rms into hung
Merge branch 'khanh'
Add value facility status
Merge branch 'master' of github.com:github15693/rms
Add function forms
fix conflicts
Merge branch 'master' of github.com:github15693/rms