Merge branch 'fixbug_20140712'
Merge branch 'master' of https://github.com/helloabob/kankanVideoEditor