Merge branch 'lukas_issue290_bug_fix-separation-of-scales-data-handler' into 'lukas_issue292_feat_data-preprocessing' # Conflicts: # mlair/data_handler/data_handler_mixed_sampling.py
