UserContext should store locationId instead of the Location object - TRUNK-3883

added some changes

applying auto commit changes

Fixed userContext.getLocation to return null when locationId is null -
TRUNK-3883

Added @since and javadocs for getters and setters of
userContext.locationId - TRUNK-3883
Merge branch 'master' of https://github.com/wluyima/openmrs-core

Conflicts:
	api/src/main/java/org/openmrs/api/context/UserContext.java