conclusion
Merge branch 'platform' of github.com:micky686/Esen2012 into platform