Merge branch 'dev'
Merge branch 'dev'
Merge pull request #2 from warmlogic/dev

Dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/warmlogic/happening
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
include footer
Merge branch 'master' into dev