fixed build errors on 14.04
travisci fix
Merge branch 'master' into development