Laptop css changes
Merge branch 'master' of https://bitbucket.org/eslem/slemframework

Conflicts:
	MailEdit/css/mf.css
DragDrop Img
JSON to input