Merged develop and local
Factories done.
Merge branch 'develop' of https://github.com/kingllama/parent-teacher into develop
Merge into Develop