small cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/week_entry/weekEntryComponents.jsx
powerpoint presentation React
Merge remote-tracking branch 'origin/master'