ServiceLinks done and form interface amended
Merge branch 'master' of github.com:yellowducklabs/trelegator

Conflicts:
	app/controllers/trelegator_controller.rb