change login redirect
resolve merge conflicts in lis/views.py
change pictures ddisplay on gallery page