Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/view/AccountPanel.java
	src/main/java/view/CourseDetails.java
	src/main/java/view/GroupDetails.java
	src/main/java/view/LoginPage.java
	src/main/java/view/MarksPanel.java
	src/main/java/view/SearchPanel.java
	src/main/java/view/SearchResultPanel.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
poprawione account