ignore eclipse and build files
Merge branch 'master' into feature/forward_server