Merge origin/master

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