Merge branch 'master' into turkey-boss

Conflicts:
	src/maps/black-caverns-2.tmx

merge with master
removed life reference in shopping
Add custom error handlers

Note that the handlers included here are just the defaults for love.
We'll be changing these in the future to send items to Sentry
Merge branch 'master' into break-block

Conflicts:
	src/character_map.lua
	src/maps/village-forest.tmx
adds crack to finish breakable blocks
Added in an all arg, removed lost dvd
Made handling of quit option similar to the other actions

Moved the special handling of the quit option from the keypressed
function to its own function, the existing action-handling code will
handle the new quit function by design.

Also added a check for the up/down keypressed events to ensure that the
right-hand menu is selected before parsing the events.
Updated credits.lua
can no longer stand next to turkey
Negative money changes

Fixed trying to start playing with negative money
Fixed the initial bet amount to be 1, instead of 2 if the player only
has 1 coin. This way, negative money can't occur.
Fixed the game over check to be < 1 instead of == 0.
Reduced calls to db:flush() to reduce stuttering

Added a flag to track if the options db needs to be udpated, this
reduces the number of calls to db:flush() while navigating the options
menu, thus reducing UI stuttering.
tileset changes
tileset changes
more stuff
Moved the FPS-drawing code to main

By moving the code to main.lua, all of the game windows will have the
FPS drawn on them if the option is enabled, without having to add the
code to each individual window.
Fixed font size changing with quit prompt

Fixed an issue where the font size would change in the poker and
blackjack games.
Add BetaFish

Added to make the fish in Gay island fitting with the scenery
Merge pull request #1274 from DaNiwa/betafish

Change Gay Island fish sprites
Initial Commit
Add death Sprite