usersettings and upload
Merge branch 'master' of https://github.com/galaxyAbstractor/ducking-octo-ninja

Conflicts:
	application/views/user/userpanel.php