- 1.0.1-SNAPSHOT
- Added master branch to travis
Merge branch 'devel'

Conflicts:
	pom.xml