Deleted weird artifacts in menu-ui.js
Cindy's updates with timeline graphing javascript in progress
Merge branch 'master' of https://github.com/AXS-Studio/cmc002

Conflicts:
	mht/js/menu-ui.js