Minor changes
Merge origin/develop into develop

Conflicts:
	src/main/java/info/bliki/extension/action/query/Query.java