Signed-off-by: dailey <dailey.yet@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyJs/js/apex/fullcalendar-base.js
	MyJs/js/apex/new_file.js
	MyJs/js/apex/today-events-callendar.js