Merge branch 'checked_out_branch2'
Merge branch 'master' of http://github.com/pqtoan/testLarionGit