[Branch ~dhis2-devs-core/dhis2/trunk] Rev 210: Minor bugs fixed. Combostores sorted.

Support - Assistance technique