Revert 2 of 3 @ 24-03-2014 : "Merge branch 'master' of https://github.com/huahengling/HLA-New-Design"

This reverts commit 70dc55ea5c7775758ebf42d5ed81288edaa41918, reversing
changes made to 66d3f88b44f916ecdccfe0ec06503114bf1c0945.