fixed admin page and made debug apk availale
trying to fix bad merge
RESOLVED BAD MERGE