Merge branch 'master' of https://github.com/john098/HCFTW

Conflicts:
	app/src/main/java/com/example/johnpham/hcftw/Calender_.java
Merge branch 'master' of https://github.com/john098/HCFTW
fix errors calendar, newnotes
Merge branch 'master' of https://github.com/john098/HCFTW
update home,calendar, report
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml