pulling recent changes
Merge remote-tracking branch 'origin'
took out NSlog statements from debugging employee id. doesn't ask to import on welcome screen.