Clean up source files
Merge branch 'master' of https://github.com/jiajun86/MeanContact