fix incorrect submit button reference in condition_edit
use string.xml in location_machine_edit
update machine condition keeps track of new condition internally
new icon assets
Merge branch 'enhancements'