Merge branch 'master' of https://github.com/biolab/orange3

Conflicts:
	Orange/canvas/__main__.py
	Orange/data/filter.py
	Orange/data/io.py
	Orange/data/sql/table.py
	Orange/feature/discretization.py
	Orange/tests/__init__.py
	Orange/tests/sql/test_sql_table.py
	Orange/widgets/data/owdatainfo.py
	Orange/widgets/data/owsql.py
	Orange/widgets/visualize/owmosaic.py
	Orange/widgets/visualize/owparallelcoordinates.py
	Orange/widgets/visualize/owparallelgraph.py
Merge branch 'master' of https://github.com/biolab/orange3

Conflicts:
	Orange/canvas/__main__.py
	Orange/data/filter.py
	Orange/data/io.py
	Orange/data/sql/table.py
	Orange/feature/discretization.py
	Orange/tests/__init__.py
	Orange/tests/sql/test_sql_table.py
	Orange/widgets/data/owdatainfo.py
	Orange/widgets/data/owsql.py
	Orange/widgets/visualize/owmosaic.py
	Orange/widgets/visualize/owparallelcoordinates.py
	Orange/widgets/visualize/owparallelgraph.py