Fixed conflicts that were produced in the previous revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	MasterPage.Master.cs
	js/calendar.js
Merge branch 'master' of https://github.com/pccsei15/ninja