fixed jar errors
Merge branch 'master' of https://github.com/fcpteam1/project/