fix message
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/_login.html.erb
	app/views/layouts/_menu.html.erb
	app/views/members/show.html.erb
	app/views/messages/edit.html.erb
	app/views/messages/index.html.erb
	app/views/messages/new.html.erb
	app/views/messages/show.html.erb