Fixed attack generation
fixed generations
small thing
alterations
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPGPersistence/src/com/jreale4/RPG/server/model/persist/FakeDatabase.java