Finish without google api

Finish without google api
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.py
	schedule_api.py
	static/coreSearchStyle.css
	templates/coreSearch.html
	templates/coreSearchHome.html
	templates/index.html
	templates/test.html
	views.py