Pallavi makes changes.
Merge branch 'master' into Development

Conflicts:
	src/test/java/net/masterthought/example/ATMTest.java
	src/test/resources/net/masterthought/example/ATM1.feature
	src/test/resources/net/masterthought/example/ATM2.feature