Merge branch 'master' of https://github.com/goodwinnk/kotlin-eclipse

Conflicts:
	kotlin-eclipse-core/META-INF/MANIFEST.MF
	kotlin-eclipse-ui/META-INF/MANIFEST.MF