updated qa.py
Merge branch 'develop' into feature/custom_404_handler