adding sensor_type_id to actions_types :*
test_data adjusted :*
adjusted tables + test data :*
premerge
Merge branch 'master' into web
new task: client side done
merge