image upload updated
merged with dev
uploading images dones
Merge branch 'images' into dev
Merge branch 'message' into dev
fixed conflicts with pull
fixed new message action
delete conversations instead of messages
incoimng messages now display on dash, changed the width of the app, added mark_as_read functionality
added something to dashboard?