commit 2.1 code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/conditions/CondHasPotion.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/conditions/CondIsBlock.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/conditions/CondIsDivisible.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/conditions/CondIsPrime.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/effects/EffCustomSound.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/effects/EffMakeDamage.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/effects/EffTexture.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/expressions/ExprEnchantLevel.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/expressions/ExprLore.java
	src/com.w00tmast3r.skriptaddon.skriptplus/elements/unused/EffPathfind.java
	src/com/w00tmast3r/skriptaddon/skriptplus/SkriptPlus.java
commit even more 2.1 code