Wololo
Wololo
Merge remote-tracking branch 'origin/shard-prototype' into shard-prototype

Conflicts:
	src/main/java/pw/edu/elka/rso/logic/beans/QueryExecutorImpl.java
Wololo