changed ember version and started on milestones
merged company stuff