Changes using variables in the view
Merging master with dev. I get the things from master
Bring all together
All together in master