Merge your branch back to develop

This pull should allow you to merge back to vcmi/develop. It also fixes trailing whitespace in touched files.