Settlement detail
Merge branch 'master' of github.com:quavmo/lists

Conflicts:
	lists/default/settlementDetail