Merge oneDeadline controller and deadline controller into one file
Move template of one deadline action into proper templates group
More comments
Split vote related code to separate controller
Finish merge one deadline into deadline controller
Merge branch 'reveiw1'

Conflicts:
	app/controllers/one_deadline.js