implementing merge
fix
todo
Merge branch 'master' of github.com:proycon/flat

Conflicts:
	style/flat.editor.css