Merge branch 'feature/COMP-70-2_budget_api' into 'develop'

Changed to psycopg2-binary to allow building on release server

See merge request live-projects/compendium-v2!10

requirements.txt

@@ -4,7 +4,7 @@ Flask
 Flask-Cors
 Flask-SQLAlchemy
 Flask-Migrate
-psycopg2
+psycopg2-binary
 Sphinx
 sphinx-rtd-theme
 SQLAlchemy

setup.py

@@ -15,8 +15,9 @@ setup(
         'flask-cors',
         'flask',
         'Flask-Migrate',
-        'psycopg2',
-        'SQLAlchemy'
+        'psycopg2-binary',
+        'SQLAlchemy',
+        'Flask-SQLAlchemy'
     ],
     include_package_data=True,
 )