Merge models, remove old files, register Activity and Notification in admin interface and recreate migrations
Close "Recreate migrations" from #134 (closed)