Fixed a number of bugs with pricing due to using strings (Why?) but solved now
Added a separate fix for the string conversion for daily subtotals
Merge branch 'master' into develop

Conflicts:
	SmartReceiptsLibrary/src/co/smartreceipts/android/model/TripRow.java
	SmartReceiptsLibrary/src/co/smartreceipts/android/persistence/DatabaseHelper.java
	SmartReceiptsPRO/test/co/smartreceipts/tests/ReceiptRowTest.java
	SmartReceiptsPRO/test/co/smartreceipts/tests/utils/TripUtils.java
Resolved some additional merge conflicts
Added some basic analytics tracking in order to capture app trends