Merge branch 'master' of https://github.com/weslgames/MERCury.git

Conflicts:
	MERCury/src_base/com/teama/merc/util/DopplerTileMapReader.java
	MERCury/target/MERCury.jar
Fixed particle effect