Fix include_entities to include_user_entities where appropriate. closes #4
Merge branch 'hiromi2424-fix-include-entities' into develop