CSS changes
Merge branch 'master' of https://github.com/danielto0252/SmartClickR2

Conflicts:
	public/javascript/views/login.js
Settings ajax validation