more fixes for save survey refs item:414
fixed stock count units refs item 392
fixed date added bug
more fixes for save survey refs item:414
Merge branch 'upstream-develop' into fix/stock-count-units

Conflicts:
	app/scripts/services/presentationfactory.js
added count units to discard count.
added error handler to presentation
Merge pull request #258 from jofomah/fix/stock-count-units

Fix/stock count units