Userpic init
Merge branch 'gh-pages' of https://github.com/alignedcode/optimal into gh-pages

Conflicts:
	upload.php