test
master update
hot fix
hot fix1
Merge remote-tracking branch 'origin/Feature1'

Conflicts:
	HelloWorld/src/ClassOne.java
Merge branch 'HotFix'

Conflicts:
	HelloWorld/src/ClassOne.java
test
Merge branch 'Development' of https://github.com/mikhaylovk/demandware into Development