add models, add south and migrations
merge remote changes