final fix for migrations
Merge pull request #2 from emmack/map

Map
changes committed before merging data_set_model with master
merge commit between data_set_model and master
working on slider toggle
switch toggle working
fixed merge conflicts