Merging [MelnormeLang]
Merging [MelnormeLang]

# Conflicts:
#	plugin_ide.ui/icons/ide-logo.32x32.png
#	plugin_ide.ui/icons/ide-logo.48x48.png
#	plugin_ide.ui/icons/ide-logo.png
#	plugin_ide.ui/resources/intro/intro.css

GoClipse/goclipse,GoClipse/goclipse,GoClipse/goclipse