Rename to attachment_form
Attachments WIP
Merge branch 'master' into fix-angular-attachments
Merge branch 'group-settings-form' into fix-angular-attachments

Conflicts:
	lineman/app/js/controllers/comment_form_controller.coffee
	lineman/app/templates/discussion.haml
Fixes for progress bar, allow deleting of attachments
Merge branch 'angular' into fix-angular-attachments

Conflicts:
	app/services/attachment_service.rb
	lineman/app/css/thread.scss
	lineman/app/js/controllers/add_comment_controller.coffee
	lineman/app/js/controllers/attachment_form_controller.coffee
	lineman/app/js/controllers/comment_form_controller.coffee
	lineman/app/js/services/attachment_service.coffee
	lineman/app/templates/add_attachment.haml
	lineman/app/templates/add_comment.haml
	lineman/app/templates/comment_form.haml
Hell of a merge conflict, buddies!