Merge branch 'master' into develop
fix crash with LIFE, fix compiling with lua (again)
Revert ef6cc9c, due to some advanced electronics breaking

TODO: add a flag to some electronics so that we can fix all the bugs at once / add new things without breaking things