Dev smsbillables

Rebased dev-smsbillables (no conflicts) to merge into master.