added jquery.fileupload
using original filename in uploader
added upload avatar action and policy
added file upload to edit account
added public/upload to gitignore
Merge branch 'avatar'

* avatar:
  added public/upload to gitignore
  added file upload to edit account
  added upload avatar action and policy
  using original filename in uploader
  added jquery.fileupload

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/models/user.rb
	config/routes.rb