Don't use hardcoded URLs
Merge remote-tracking branch 'upstream/online' into ayke-no-hardcoded-urls

Conflicts:
	actions/links.php
Use euri consistently
Merge pull request #27 from aykevl93/ayke-no-hardcoded-urls

Don't use hardcoded URLs