first add
changed site loading
Merge branch 'develop' into feature/rest_connect_to_site

Conflicts:
	main_page/templates/flexdb/index.html
	main_page/views.py
Merge pull request #6 from EE/feature/rest_connect_to_site

first add