Updated DB
merging
fixing merge problems
forgot to update database
Added photo compress