changes
Merge branch 'master' of github.com:jummonk/leuven2013.drupalcamp.be

# By Frederik Wouters (2) and G-raph (2)
# Via Frederik Wouters (2) and G-raph (1)
* 'master' of github.com:jummonk/leuven2013.drupalcamp.be:
  txt files not added
  deploy test
  Let's Rock!
  Speakers view theming fix: desktop, tablet.

Conflicts:
	sites/leuven2013/themes/dcl/js/countdown.js
Honeypot module
Merge branch 'master' into develop

* master:
  Honeypot module
  changes