1
Merge branch 'master' of ssh://git@github.com/mikkax/seoManager.git

Conflicts:
	.classpath