- lost file
Merge branch 'master' of https://github.com/kolmar1991/video_repository

Conflicts:
	client-side/target/classes/gui/view/MainCardView.class