Changed index.html to index.php to allow for already loggedin users
Merge branch 'master' into getdata-tags-and-doc

Conflicts:
	html/php/authentication.php