QuickStartChanges-10202014-1

After checking if existing company, one sceraio to overwrite data for
company in case of continue with saving data done -- Spent 2 hours
Previous checkin work of 2 hours also