added pg for heroku
removed header popup
ajaxified bot login and signup form for user and merchant