settings working at home
Merge branch 'master' of http://github.com/sekaidragon/conductor-dev2
Merge branch 'master' of http://github.com/sekaidragon/conductor-dev2
Merge branch 'master' of http://github.com/sekaidragon/conductor-dev2
collapse functionality added