Merge pull request #138 from eHealthAfrica/develop

Demo 2014-03-21
Merge branch 'develop' of https://github.com/eHealthAfrica/LMIS-Chrome into develop
insert method refactoring, #new: update, save. #deprecated:getTables
storageService unit tests update
add check if uuid is not empty
Method renaming: addTable() -> setStorageData(), getTable -> getStorageData()
chromeStorageApi resolve value fix - #312 item
Prompt to sync later on error, closes item:357
further refactoring
add setTable() method which loads init data
Use sandbox CouchDB server, closes item:370
Merge pull request #191 from tlvince/refactor/aws-couch

Use sandbox CouchDB server, closes item:370
Merge pull request #189 from tlvince/bug/stockcount-error-handling

Prompt to sync later on error, closes item:357
changed stock count nav buttons to align side by side in mobile mode closes item:351
Merge branch 'develop' into refactor/re-arrange-ui-elements
Merge pull request #192 from musamusa/refactor/re-arrange-ui-elements

Refactor/re arrange ui elements
Merge remote-tracking branch 'origin/develop' into develop
resolve merge conflicts
Merge branch 'upstream-develop' into feature/stock-out-alert

Conflicts:
	app/_locales/en/messages.json