Update documentation
Fix merge

Merge branch 'master' of https://github.com/SESman/SES

Conflicts:
	DESCRIPTION
More functions dealing with time and location