Merge branch 'release/0.1.0'
Linux
Merge pull request #1 from Deraen/master

Linux
pumpped version
Merge branch 'master' of github.com:jarppe/sormilla into release/0.2.0

# By Juho Teperi
# Via Jarppe (1) and others
* 'master' of github.com:jarppe/sormilla:
  Linux

Conflicts:
	.gitignore
.
Merge branch 'master' into release/0.2.0

* master:
  .

Conflicts:
	.gitignore
Merge branch 'release/0.2.0' into develop
0.2.1-SNAPSHOT