Luke Pulverenti c504f5005d fix merge conflict

2015-12-19 10:54:44 -05:00

..

android

merge from dev

2015-12-14 10:43:03 -05:00

ie

ie guide fixes

2015-12-14 12:42:09 -05:00

ios

fix merge conflict

2015-12-19 10:54:44 -05:00