fix + nin modal
Merge branch 'master' of https://github.com/hunterbmt/xml_project
Merge branch 'master' of https://github.com/hunterbmt/xml_project