dsa
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/com/dicks/pojo/Rule.hbm.xml
	HelloWorld/src/com/dicks/pojo/Rule.java