fixed copying of defaults to user attributes, so view code doesn't have to handle defaults
Merge branch 'feature/search' into develop
added OSM transport map
implemented closing tabs / removing feeds from the world
added option for OSM Transport map to userOptions
Merge remote-tracking branch 'nilclass/develop' into develop

Conflicts:
	app/models/user.js