TRUNK-2707: Location hierarchy should not allow loops, description should not be required

https://tickets.openmrs.org/browse/TRUNK-2707

Fixed all my git problems now