added activity info
fixed conflict
integration with S3
added images to expenses
fixed problem with content type
enable/disable s3
resolved conflicts
updated readme