conflict
Merge branch 'master' of
https://github.com/bug-tracker-dev/bug-tracker.git

Conflicts:
	bt-service/src/test/java/com/abc/bt/common/dao/GenericDaoHibernateSupportTester.java