tests
Merge branch 'master' of https://github.com/sanelib/newgenlib

Conflicts:

	trunk/src/main/java/com/ngl/dao/readonly/impl/TopStoryViewRepository.java