updated makefile
Merge branch 'develop' of github.com:ourway/fa-team into develop