Fixed IE sass, some TODO tweaks
Fixed merge conflict with a forgotten commit

Conflicts:
	TODO.md