Conitnue fixing of #2037#2063

Merged

wing328 merged 2 commits intoswagger-api:masterfrom

mtngld:issue_2037

Feb 8, 2016

Commits on Feb 7, 2016

Now it should be fully compatible with python 2.7 and 3.4
Matan Goldman
committed
change the order of the elif inside to_dict for better performance (dictionary/additionalProperties is less probable)
Matan Goldman
committed