don't merge branch
Merge remote-tracking branch 'origin/ivanoff-dev' into hql

Conflicts:
	src/org/onepf/repository/AppContextListener.java
	src/org/onepf/repository/model/services/mysql/SqlDataService.java
merge with ivanoff-dev & bugfixing
fixes
Merge remote-tracking branch 'origin/hql' into ivanoff-dev