Placeholder data
Remove empty route and controller
Merge remote-tracking branch 'upstream/master'