Updated travis to build "develop" branch too
Merge branch 'master' into develop
Added some describtions