wrkspace
Merge branch 'master' into detailView
_variables to self.variables