fixed: s2 logo width
fix: some minor issues with formating js to better [code-standards]
fixed: https://github.com/usmanhalalit/charisma/pull/18
some enhancement of login.html page (css cleanout included) and divide login x login-amazing page to two pieces
login-amazing: some incremental work on it; rename some important images (~cleanout) and xNOTES.TXT to write some ideas about login page and whole templates...
Merge branch 'develop-s2' into develop-zatebou

Conflicts:
	css/themes/zatebou/app-charisma.css
	css/themes/zatebou/bootstrap.css
	img/charisma/s2-logo.png
	js/charisma.js
	login.html