Optimizing Canvas/Tilemap when scale or color is set by drawing scaled/colored image to intermediate buffer.
Invalidate and redraw intermediate buffers when color or alpha are changed.
Dispose of intermediate buffers when throwing them away.
Call dispose on old BitmapText buffer before recreating.
Fixing bad merge resolution.
Merge pull request #203 from bendmorris/tilemap

Optimizing Canvas/Tilemap when scale or color are set on Flash
Scaling Backdrop properly for atlas rendering, related to #158
Adding 'any button' checks to Joystick.

Omit argument to check for any button.
Ouya home button + info

This information is pretty important.
adding CONTRIBUTING file
tweaks to contributing document
Formatting
visual tweaks to CONTRIBUTING
Merge pull request #219 from Nananas/dev

[ouya] 'any button' check and Home-button information for Joystick.
Consistent formatting
More minor formatting
Merge branch 'dev' into v2.6

Conflicts:
	com/haxepunk/graphics/atlas/BitmapFontAtlas.hx