Merged master with local changes. The conflicting problems was caused because some file renames and I fixed that.