Schema revised 10-20-14

Schema slightly revised
Merge branch 'master' of https://github.com/mai35/ContemporaryFolkProject