Merge origin/master

Conflicts:
	src/kickassdb/Operations.java
	src/queries/SelectQuery.sql