Merge branches 'master' and 'projects' of https://github.com/matthias-g/stc-karlsruhe into projects
Repair location picker default values and project explorer map marker view.
Merge branch 'master' of https://github.com/matthias-g/stc-karlsruhe into projects
-
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'matthias/master'

Conflicts:
	app/assets/stylesheets/main.css.scss
	app/controllers/users_controller.rb
	app/views/devise/mailer/confirmation_instructions.html.erb
	app/views/devise/mailer/reset_password_instructions.html.erb
	app/views/devise/mailer/unlock_instructions.html.erb
	app/views/layouts/application.html.erb
	app/views/page_sections/edit.html.erb
	app/views/page_sections/index.html.erb
	app/views/page_sections/new.html.erb
	app/views/page_sections/show.html.erb
	app/views/pages/_smallheader.erb
	app/views/pages/index.html.erb
	app/views/pages/new.html.erb
	app/views/pages/show.html.erb
	config/locales/en.yml
	vendor/extensions/projects/app/views/refinery/projects/projects/show.html.erb
Edited all views so that they fit into the default layout.
Merge remote-tracking branch 'matthias/master'