v1.1
update
Merge branch 'master' of https://github.com/Exomnius/MeetAndGreet

Conflicts:
	www/MeetAndGreet/application/controllers/main.php
	www/MeetAndGreet/application/views/pages/home_view.php
	www/MeetAndGreet/application/views/templates/header_view.php
Fixes