Merge branch 'dev'
resolved confilcs
resolved confilcs
post
posts
rm config/index.html
Merge branch 'dev' of github.com:horx/xms into dev