Merge branch 'develop' of https://github.com/despondentdonkey/bpm into test
Adjusted random bubbles
Changed the way levels are loaded, streamlined code.

Changed getType to getEditor, type conversion is now handled by cgf. Added
adding levels by passing an object, cleaned up code in bpm_states,
disabled debugging in state, new commenting style.
Adjusted pin charge.
+ TODO stuff
Resized canvas to match Tiled level size
Updated TODO
Adding new levels, started to put conversion in assets
Balanced pin shooter. Made pins fade later
GUIButton: Added x, y as optional options
Parser: updated, removed Ogmo dependencies

Improved code efficiency as well.
Added reset button, reset on "r" press

Removed XML round
Updated comments, add currentID tracker for resetting
Added getRandom with constraints func
Added bubble creation in range constraints
Defaulted bubble speed to 0
Adding levels
Merge branch 'develop' of https://github.com/despondentdonkey/bpm into donkey

Conflicts:
	gui.js
Removed merge conflict tags
Added better bubble tinting.