Added settings page, gradients, buttons, saved preferences
Merge remote-tracking branch 'origin/master'

Conflicts:
	Resources/app.js