bugfix index.html
Merge branch 'bugfix1' into develop

Conflicts:
	index.html
Merge branch 'develop' into bugfix1

Conflicts:
	index.html
Merge branch 'bugfix1' into develop

Conflicts:
	index.html
Merge branch 'bugfix1' into develop

Conflicts:
	index.html
Merge branch 'bugfix1' into develop

Conflicts:
	index.html
step 4
Merge branch 'bugfix1' into develop

Conflicts:
	index.html
dev1
dev2
dev3
dev4
test
test
Merge branch 'test' into develop

Conflicts:
	index.html
Merge pull request #2 from davidecantoni/test

Test