Merge branch 'release/publish-20140929' into develop
fix files bug
Merge branch 'develop'