2945 master demographic - city field too short
#2926 - Quick List Group
Merge "#2926 - Quick List Group "
2898 long term drugs should stay current during lifetime

Change-Id: I0db4c1224051518c45df900f5e6bc8417a7035f1

Conflicts:

	src/main/webapp/oscarRx/ListDrugs.jsp
2948 new SLI code PDF needed

Conflicts:

	src/main/webapp/billing/CA/ON/billingON.jsp
Merge "2945 master demographic - city field too short"
Merge "2898 long term drugs should stay current during lifetime"
Merge "2948 new SLI code PDF needed"