Merge branch 'upstream' into theme

Conflicts:
	app/js/settings.js
	app/js/tabs.js
Added ability to change the theme.

Default theme is the Text Drive theme that is defined in the Editor. Other themes are from Ace.
Using the minified version of Ace, as before
Added ability to toggle word wrap in settings.

Fixes #67
Merge branch 'wrap'

Conflicts:
	app/js/settings.js
	app/js/tabs.js