added api routes that do nothing
Merge remote-tracking branch 'origin/master'