Merge remote-tracking branch 'upstream/3.0-stable' into 3.0-stable

Conflicts:
	.travis.yml
	app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
	app/assets/stylesheets/alchemy/form_fields.scss
	app/assets/stylesheets/alchemy/frame.scss
	app/models/alchemy/message.rb
	app/models/alchemy/page.rb
	app/views/alchemy/admin/pages/configure.html.erb
	app/views/layouts/alchemy/admin.html.erb
	config/alchemy/config.yml
	config/locales/alchemy.en.yml
	config/locales/alchemy.nl.yml
	lib/alchemy/permissions.rb
	lib/alchemy/version.rb
	spec/features/admin/page_editing_feature_spec.rb
	spec/helpers/admin/base_helper_spec.rb
	spec/libraries/tinymce_spec.rb
	spec/models/message_spec.rb
Merge branch '3.0-stable' into paperculture