#48 JSON server change

Changed URLs of the JSON server
Merge branch 'new_survey_json_structure' into Development
Merge branch 'Development' of https://github.com/Capstone-F13/Questionnaire-App into Development

Conflicts:
	QuestionaireApp/QuestionaireApp/Base.lproj/Main.storyboard