added changes
Merge branch 'master' of https://github.com/shekhar2010us/amihunt

Conflicts:
	src/main/java/com/unittest/middletier_test_shekhar/AdModelTest.java