huge server-side refactoring
pull requests encapsulated inside branch
build view fixed