fixed style with PHPStorm
added travis configuration
Merge branch 'master' into code_style