custom settings
Merge remote-tracking branch 'jansch/develop'
Merge branch 'develop' of github.com:janschulte/js-sensorweb-client into develop

Conflicts:
	WebContent/js/models/settings.js
make favorite star clickable on station selection window
Merge pull request #97 from ridoo/fixes/favorite-star_not-clickable

Fixes/favorite star not clickable