init
Merge branch 'master' of https://github.com/chuongnh3/mag_ee_1.12