add links
change link
Merge branch 'ui'

Conflicts:
	index.php