Backbone 1.1.x support
Merge branch 'hotfix/0.5.2'
Merge tag '0.5.2' into develop

0.5.2

Conflicts:
	bower.json
	dist/gui.js
	dist/gui.min.js
	package.json