Changes for the past week (includes polling on dashboard and user settings)
Most of the user setting stuff
Merge remote-tracking branch 'origin/dev' into chanelsbranch
Merge remote-tracking branch 'upstream/dev' into chanelsbranch
Quick error catching for changing interval
Comments are populated at the bottom of the page; initiatives only for now
In progress commenting. Pulling to be updated
Merging
Page refreshes on adding a new comment.
Merging with Alec's changes dealing with initiatives.
Nothing to see here
Can now add comments to risks and milestones.
Merge branch 'dev' into chanelsbranch

Fixed conflicts in the below files
Conflicts:
	app/controllers/Application.java
	app/views/initiative.scala.html
	app/views/milestone.scala.html