Merge pull request #29 from liuggio/master

added events, moved things
Merge pull request #30 from liuggio/html

User interface
Merge pull request #31 from liuggio/html

capifony and html fixes
Merge pull request #32 from liuggio/html

fix copy/paste
Merge pull request #33 from liuggio/html

added directory as parameter, improved deploy
fixed bug on bot