Merge pull request #138 from eHealthAfrica/develop

Demo 2014-03-21
added waste count help text and form fields refs item:280
removed all unused codes, changed waste count controller refs item:280
removed all unused codes refs item:280
added getWasteCountByDate function, changed waste count string to constant and removed more unused codes refs item:280
changed stock count counter to numeric type
added logic for waste count validation and saving to database
Merge branch 'upstream-develop' into refactor/change-to-numeric-type-counter
added form and preview markup for waste count refs item:280
position dropdown from hiding under panel body refs item:280
added waste count key to ref getWasteCountByDate() refs item:280
added fastclick to index.html
added waste count button refs item:280
added waste count constant
added waste count image and removed unused stock count file refs item:280
Merge branch 'develop' into feature/waste-count-form

Conflicts:
	app/scripts/controllers/stockcount.js
	app/scripts/services/storage-service.js
	app/styles/main.css
	app/views/home/main-activity.html
Merge branch 'develop' into feature/waste-count-form

Conflicts:
	app/scripts/controllers/stockcount.js
	app/scripts/services/storage-service.js
	app/styles/main.css
	app/views/home/main-activity.html
Merge branch 'develop' into feature/waste-count-form

Conflicts:
	app/scripts/controllers/stockcount.js
	app/scripts/services/storage-service.js
	app/styles/main.css
	app/views/home/main-activity.html
Merge branch 'develop' of https://github.com/eHealthAfrica/LMIS-Chrome into develop
Merge branch 'develop' into feature/waste-count-form

Conflicts:
	app/views/home/main-activity.html