alert box in login page for both signin and register
alert box in login page for both signin and register
calendar file
update app.js
moved angular.min.js file and modified calendar
swapped schedule.init params
Merge branch 'COcalendar'

Conflicts:
	site/app/js/app.js