merged
backward compat tags
Merge branch 'master' of https://github.com/BinaryAnalysisPlatform/qira

Conflicts:
	middleware/qira_config.py