not required
don't erase database before making an api
optimization changes to import script
removing regex from views
Merge branch 'coconut-clinic' of https://github.com/mikeymckay/coconut into coconut-clinic

Conflicts:
	build_android_app/make.sh
removing unused js