commit temp 2014-8-12
Merge branch 'master' of github.com:lintaian/edc