US685 - Improvements to implicit conversions
US685 - implement counts
Merge branch 'withWS' into integration

Conflicts:
	casa/app/services/ClaimServiceImpl.scala
Getting back the WS calls