added phoneQuestion type
added selectQuestion type
fixed checkboxQuestion issues
added phoneQuestion type
added selectQuestion type
fixed checkboxQuestion issues
Merged in Master, fixed name, email and radio questions (added to index.html)
Merge remote-tracking branch 'origin/addedblocks' into addedblocks

Conflicts:
	app/index.html
	app/views/blockDirective.html
Remove landing page
Add route that redirects user to first page of registration
added phoneQuestion type
added selectQuestion type
Tweak sample conferences
Add email question
Remove duplicate
Merge pull request #21 from CruGlobal/addedblocks

Addedblocks, fixes #15