moved merchant settings to common.py
moved merchant static files to static
convert merchant_id to integer