Removing conflict
Merge branch 'master'

Conflicts:
	webcontent/framec.html