Remove div_id var in views
Merge branch 'develop' into active_card
Some cleanup