Separate map.js into different files
Merge branch 'master' of https://github.com/ubc-magic-students/enph479-2013
Add mediator file
Add mediator file reference
Implement mediator refactoring for timemanager
Merge branch 'master' of https://github.com/ubc-magic-students/enph479-2013
Merge branch 'master' of https://github.com/ubc-magic-students/enph479-2013