login buttons js
design fixed
offset added
garbage deleted
merge conflict
Merge branch 'production'