[ALOY-784] fix for some tests
Merge branch 'master' of https://github.com/appcelerator/alloy
Merge branch 'master' of https://github.com/appcelerator/alloy
[ALOY-503] Databinding with map annotations
Merge pull request #372 from skypanther/ALOY-503

[ALOY-503] Databinding with map annotations