[develop-zatebou] -> [develop-s2]

- login.html
- login-amazing.html
- img cleanout
- css cleanout (~app-charisma.css) split into some more logical pieces