Merge branch 'master' of github.com:Aleks-Ya/yaal_examples

Conflicts:
	Java/Database/JPA/EntityManager/CriteriaQuery/CriteriaQuerySelect/src/Main.java
Merge branch 'master' of github.com:Aleks-Ya/yaal_examples