Main PAGE
Merge remote-tracking branch 'origin/master'

Conflicts:
	HOBBIE/mainpage/templates/main_page.html
Merge remote-tracking branch 'origin/master'