Performance improvements to User queries
Comments work in progres
Merge branch 'master' into comments

Conflicts:
	config/routes.rb
Merge branch 'master' into comments
Merge branch 'master' into comments
Comments WiP
Merge branch 'master' into comments

Conflicts:
	app/views/categories/show.html.haml
	app/views/projects/show.html.haml
Comments done without ajax
Start implementing ajax comments
Ajax comments done