Paste
Merge branch 'master' of https://github.com/rain1/paste_online

Conflicts:
	Settings.php
	includes/ucp/ucp.php