first version (unstable) of web
stable version of web version
app-model updated with corresponding entities
fanky changes into master