calendar changed to GregorianCalendar
Merge branch 'master' of https://github.com/arvdroid/HealthPact

Conflicts:
	README.md
GregorianCalendar
GregorianCalendar