Travis
Maven
Merge branch 'maven'
Merge branch 'travis'