Entities have user data
Merge branch 'master' of https://github.com/highfidelity/hifi into entities_userdata
String specific macros
moved append to the end
Move macros to the end
Move user data to end of enum
Merge pull request #3790 from Atlante45/entities_userdata

Entities userdata