Rails 4.0.3 migration
Ruby 2.1.1
Allow override aliases in application#set_title
Merge ../x0y0

Conflicts:
	Gemfile.lock
Accept title in link_with_icon helper
Merge ../x0y0
Add email to entities