illya work commit
create test ContactDaoTest and ApplicationContextAware
Merge remote-tracking branch 'origin/master'

Conflicts:
	KnigaLocalProject.iml