Merge origin/master
Merge origin/master
Merge origin/master
Add Vault Hook
Updated pom.xml
Er..
Merge pull request #25 from stuntguy3000/patch02

[Feature] Add Vault Hook
Add the missing tags to animated holograms
Save holograms to file when lines are updated
Better tag replacement system and a new tag for in-game time

New tag - %mctime%
Load vault before holograms to prevent an NPE
Fix chat bubbles overlapping
Fix amplifiers on potion indicators having the wrong value
such format, many import optimise
I can't remember what I've changed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dsh105/holoapi/HoloAPI.java
	src/main/java/com/dsh105/holoapi/api/Hologram.java
	src/main/java/com/dsh105/holoapi/api/HologramFactory.java
	src/main/java/com/dsh105/holoapi/command/CommandManager.java
Should fix it... Hopefully o/
Fix for 1.6
Finish support for 1.6.x