edit
Merge branch 'Daisy' of https://github.com/quangthi90/Training072014 into Daisy
edit