login
Merge branch 'login' into development
last 5 pictures feature
Merge branch 'features' into development
conflict resolution