conflicts
Merge remote-tracking branch 'origin/master'
Holdings: adjust page;
		  use interface from sever;
Merge remote-tracking branch 'origin/master'