initial commit
Merge branch 'master' of git://github.com/thanhnguyenminh/xe
sua layout
merge fix-layout-chuong-21102013