Merge branch 'WEEK12'
conflict comment deleted
Merge branch 'WEEK13' of
https://github.com/NHNNEXT/2014-01-HUDI-LEONARD.git into editpreview