Merge "Switch from enums to ints to allow model Proxies to work" into gradle_0.8