Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/base_information.css.scss