Move blockForm to the block directive
Email block type
Added emailQuestions
Added nameQuestion
Added name Question
Merge branch 'master' into addedblocks
Merge remote-tracking branch 'origin/master' into addedblocks

Conflicts:
	app/index.html
Merge pull request #6 from CruGlobal/addedblocks

Added name block and email block