Allows JSON to overwrite other content on PUT.
Merge pull request #322 from LearningLocker/issue-245

Allows JSON to overwrite other content on PUT.
Adds fallback to php::input to fix #261.
Merge remote-tracking branch 'origin/develop'