Revert c727704..ad1601c

This rolls back to commit c72770435c371abc4727a6bb9744ea60d0d5c663.
Merge branch 'Features----MM&RS' into Development

This reverts commit b69bd3c3ccb15d4168e8e21f56000dc15d80c54f, reversing
changes made to 513f53464f1cc470f568f294d0534faefd6d085a.

Conflicts:
	Questionaire_App/Questionaire_App/Json/Json.h
	Questionaire_App/Questionaire_App/Json/Json.m
fix?