Google not defined error has been fixed
Merge pull request #20 from rpanjwani/database-refactor

Database refactor
Merge branch 'master' into recurring-times

Conflicts:
	src/client/app/index.html