Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	gradle.properties
#	hCore-bukkit/plugin/src/main/java/com/hakan/core/CorePlugin.java