master update 1
feature update 1
feature update 2.7
feature 3 update
master update 2
feature update 3
Merge branch 'feature2'

Conflicts:
	index.html
feature 3 update 2
Merge branch 'feature3'

Conflicts:
	index.html