I changed the source folders. Will stuff break when i try to merge in another in-progress branch?
Merge branch 'feature/2014.03.1/FAKE-2' into 2014.03.1