merge
Merge branch 'master' of git@github.com:guilty/bakalaurinis.git

Conflicts:
	java/bsc-parent/bsc-ui/src/main/java/lt/vu/mif/paki8529/bsc/ui/fx/components/TrainerPanel.java