Advisor panel, calendar widget
Merge branch 'master' of github.com:jcamins/easycfo

Conflicts:
	index.html
	js/main.js