Merge branch 'master' of https://github.com/maxfindel/gameworks into group5/develop
Merge branch 'master' of https://github.com/maxfindel/gameworks into group5/develop
Merge branch 'group5/develop' of https://github.com/maxfindel/gameworks into group5/develop
Javadoc
Merge branch 'master' of https://github.com/maxfindel/gameworks into group5/develop
Merge branch 'group5/develop' of https://github.com/maxfindel/gameworks into group5/develop
Merge branch 'group5/master' of https://github.com/maxfindel/gameworks into group5/develop
 cambios tamao MapObject
Sprite management changes
Merge branch 'group5/develop' of https://github.com/maxfindel/gameworks into group5/develop
fix
Map
Update
arreglo height
test fix
test fix
doc update
Some updates
doc update