init
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoyaltyServer/.classpath
	LoyaltyServer/src/main/rules/File1.drl
update