Merge pull request #40 from ayaigame/items

Fixes build
fixed more issues
added collision tiles
Merge pull request #41 from ayaigame/collision-map

Collision map
still working on fix for collision tiles
COLLISION NOW WORKS :D
Merge pull request #42 from ayaigame/collision-map

Collision map
changed GameStateSerializer.scala to use lift json
also added asJson function to health, position, and character classes (cannot use write(this) as originally thought, but this still works perfectly
mapchange still needs to be converted
tested
Merge pull request #43 from ayaigame/json-lift

changed GameStateSerializer.scala to use lift json
Implements ItemFactory and adds stats.
Merges develop into items branch.