Fix CSRF, psycopg2 instead SQLAlchemy
Merge remote-tracking branch 'origin/master'