Revert "new calendar timeline"

This reverts commit dc6e41b1468c40b3cedb82c82e5bea7c9e0d270f.
Merge branch 'master' of https://github.com/SBMG/iWed2.0

Conflicts:
	application/views/apps/calendar/calendar.js
	application/views/apps/calendar/index.php
	application/views/shared/header.php
	application/views/shared/javascript.php