nf mvc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/kirkazan/itis2014spring/pci/PatientSearchController.java