dev-grunt
dev-grunt
jostik
jostik
Merge branch 'dev-grunt' into server<->frontend

Conflicts:
	public_html/index.html
	public_html/mobile.html
	src/main/java/backend/mechanics/GameMechanics.java
	target/classes/servlets/Main.class
merge
merge