804555-51020801 Uus lehekülg Grupid
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/master_view.php