Merge origin/develop

Conflicts:
	database.db
	src/test/java/pl/projekt5/models/KolumnaModelTest.java
	src/test/java/pl/projekt5/models/ModelFactoryTest.java
Merge origin/master

Conflicts:
	src/main/java/pl/projekt5/views/view.java