Merge branch 'dev'
Merge branch 'dev'
Added placeholder for empty folder.

Author:yangyingchao, 2013-02-07