started fixing the issue with searching and json. Fixed it for actors. In the middle of fixing the others. Need raymond's code
Results actor page is finished but will have to be fixed once the changes with the API is completed.
cleaning up past work
started fixing the issue with searching and json. Fixed it for actors. In the middle of fixing the others. Need raymond's code
Results actor page is finished but will have to be fixed once the changes with the API is completed.
cleaning up past work
Merge branch 'ellen/intergrate_api' of https://github.com/wheelerl1992/frankenstein into ellen/intergrate_api

Conflicts:
	frankenstein_mobile/api/frankenstein_serialization.py
	frankenstein_mobile/api/models.py
Raymnond and I fixed some of the json rendering. And I continued to work on the format of the results pages
Merge branch 'ellen/intergrate_api' of https://github.com/wheelerl1992/frankenstein into louis/android_display_data_from_database

Conflicts:
	frankenstein_mobile/frankenstein_site/settings.py