Updates
Update version
Removed resin
Merge branch 'origin/dev'

Conflicts:
	.classpath
Update version
Merge branch 'origin/master'