Change dropbox to copy.com
Merge branch 'master' into homedesktop

Conflicts:
	xsession