Added button functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/links.txt