Uploading images to /images works
Merge uploads to master
Merge branch 'master' into b1
Merge branch 'b1'

Conflicts:
	app/actions.rb
Updated gitignore to include db.sqlite3,uploads