Add title fixed and keyword fixed
Merge branch 'omatty' into samui

Conflicts:
	index.html