created show action in api/websites controller
merging
added routes for website api
fixed merge changes with main.js
minor changes