Refactoring
Merge branch 'master' into jason

Conflicts:
	app/controllers/logins_controller.rb
Added create new category form to new task view.