Adding log uploads to settings page
Merge branch 'register' into testing