Fixing input fields
Merge origin/Fixing_Input_Fields

Conflicts:
	cp/admin/layout/css/custom.css