Schema update#12

Open

1point618 wants to merge 2 commits intomasterfrom

Commits on Dec 18, 2015

updating files
1point618
committed

Commits on Jan 15, 2016

updating schema for JP's approval
1point618
committed