Created populate rake task for Ticketee
finished the rake db:populate script
Fixed merged conflicts