Merge pull request #7 from oconn/views

Views
add calendar img
Merge pull request #8 from oconn/calendar

add calendar img
added nothing
Merge branch 'master' of https://github.com/oconn/Scheduler into views
update users
added some ajax and trying to place the events on the map