no message
Merge branch 'master' of https://github.com/Elejdor/pk_2014

Conflicts:
	trunk/KinoManagement/bin/MyCinemaSellerView$10.class
	trunk/KinoManagement/bin/MyCinemaSellerView$15.class
	trunk/KinoManagement/bin/MyCinemaSellerView$16.class
	trunk/KinoManagement/bin/MyCinemaSellerView$17.class
	trunk/KinoManagement/bin/MyCinemaSellerView$5.class
	trunk/KinoManagement/bin/MyCinemaSellerView$7.class