added data entities
more data..
Merge branch 'data' into gui
merge data -> gui
merged data and gui