Add loading file
Fixed conflict index of Guard House
synch data
Merge branch 'master' of github.com:github15693/rms into khanh