<<<<<<< HEAD ======= >>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git