added activity info
fixed conflict
integration with S3
added images to expenses
updated ruby version
fixed problem with content type
enable/disable s3
resolved conflicts
updated readme
italian
added job order to incoming invoices
update to rails 4.1.8
ui is almost ready
completed server side insertion
crud
weekly navigation
saving
styling
fixed typo
fixed week calculation