delete
commit again
Merge branch 'stg_20140206'