breakout json doctrine controller for better testing and extendability
Merge remote-tracking branch 'origin/master'