Test5
Test6
Merge branch 'master' of https://github.com/ndjordjevic/dental-rec

Conflicts:
	src/main/java/org/ndsys/dentalrec/controller/PersonController.java