switched back to body parser until all required features are working again
Merge remote-tracking branch 'origin/master'