google_login
puste linie
Merge pull request #5 from EE/feature/login

google_login
delete
Merge branch 'develop' into feature/rest_connect_to_site

Conflicts:
	main_page/templates/flexdb/index.html
	main_page/views.py