Merge branch 'hotfix/20121228_01'
Merge branch 'release/20121229_01'
Merge branch 'release/20121229_02'
Merge branch 'release/20121230_01'
fix merge
fix merge
Merge branch 'release/20121231_01'
fix merge
Merge branch 'release/20121231_02'
fix merge
fix merge
fix merge
fix merge
Merge branch 'release/20130103_02'
fix merge
fix merge
fix merge
fix merge
Merge branch 'develop'
remove trash