Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/mainframe-vc.iml
	.idea/workspace.xml
	Gemfile.lock
	config/application.rb
	db/schema.rb
	public/assets/application-052d43f63a468663211f48d1b89d073a.css.gz
	public/assets/application-62b9eef6f8d995aa1b83fdcaaef5618f.js.gz