Velocity empty class
Merge branch 'master' into dev_beta

Conflicts:
	src/main/java/com/example/Velocity.java