Push recent changes.
doc
Moved the files to correct location so that I can merge them
Moved also serializers.py to correct location waiting for merge
Merge ad hoc changes
Documented all made changes and other things we decided in a meeting today