everything ready for votes, it seems though
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/stackoverflow/parser/ImportToSQL.java