html added
Merge branch 'master' of https://github.com/thannous/sante

Conflicts:
	res/values/strings.xml