Merge pull request #14 from eHealthAfrica/feature/login-dialog-on-fresh-startup

Feature/login dialog on fresh startup
use sync service merge contact
updated config
updated config
Merge pull request #16 from eHealthAfrica/feature/update-pass-key

Feature/update pass key
fixed date ordering bug. refs item:82
remove logs
Merge pull request #17 from eHealthAfrica/bug/order-by-date

Bug/order by date
Update sync-service.js
remove logs
minor fixes to remove unnecessary state redirect.
set date modified to date synced during sync
Merge branch 'develop' into bug/correct-check-for-missing-daily-visits

Conflicts:
	app/scripts/services/sync-service.js
Merge pull request #18 from eHealthAfrica/bug/correct-check-for-missing-daily-visits

Bug/correct check for missing daily visits
Merge branch 'develop' into feature/save-interviewer-name

Conflicts:
	app/scripts/controllers/home.js
resolved merge conflicts