Added optional damage source entity parameter to entity_damage()
Merge origin/master
Merge branch 'master' of https://github.com/PseudoKnight/commandhelper into PseudoKnight-master

Conflicts:
	src/main/java/com/laytonsmith/abstraction/Convertor.java
	src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java
	src/main/java/com/laytonsmith/core/Static.java
	src/main/java/com/laytonsmith/core/functions/EntityManagement.java
	src/main/java/com/laytonsmith/core/functions/ExtensionMeta.java
	src/main/resources/functionDocs/email
Merge branch 'PseudoKnight-master'