Merge pull request #39 from buddytex/dev

Admin Menu + misc.
Merge pull request #40 from buddytex/dev

Abort Timer, 15 sec