updating lingo
Merge branch 'master' of https://github.com/tmornini/synergy

Conflicts:
	app/views/live/parent_teacher_conferences.html.erb