Merge branch 'live' of github.com:qnapp/qnapp into audience
Merge
Merge branch 'live' of github.com:qnapp/qnapp into audience
Merge
Merge branch 'live' of github.com:qnapp/qnapp into audience
Merge with live
Now pulling question data
Merge with master
Merge pull request #1 from qnapp/audience

Audience
Move presentation json to live ctrller
Fix presentation subscribing to faye
New questions are now rendered automagically
More layouts in admin
Merge branch 'master' into live
Merge branch 'audience' of github.com:qnapp/qnapp into live
Start adding live view for presenter