removed binary
added binary to ignore
Merge branch 'master' of https://github.com/foomo/ContentServer
renamed files apply naming conventions
renamed files apply naming conventions