Merge Master - Dev

Setting up heroku requires update requirements.txt and database