Add inference for fancy types
use the correct string
add tests for and fix new type inference
Merge branch 'master' into infer-types

Conflicts:
	src/main/java/com/stackmob/sdk/model/StackMobModel.java
actually add the headers
Merge pull request #24 from stackmob/infer-types

Infer fancy types