Merge branch 'master' of https://github.com/dquanghuy/aerotesting into aerotest_dev
Merge branch 'aerotest_dev' of https://github.com/dquanghuy/aerotesting into aerotest_dev