Typos
Removed files commited by mistake
Merge branch 'master' into dev
Thanks to empika: tabs!