database
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Pet/Pet.Web/App_Data/PETDB.sdf
Started on activity view and new activity pages
Added activity editing and unarchiving