Feeds xpath parser and field collection modules reverted
Added office hours module
Added contact block fields to basic page CT
Merge into master