Messages
Merge branch 'master' of https://github.com/PiotrekOrganization/ls

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/wall/_notes.html.erb