added field collection module
Merge branch 'test' into prod