restaurants controller
Merge branch 'develop' into sessions
added login functionality
fixed merge issues in header js