Main class implemented
Merge branch 'app-dev-ruliov' into develop-ruliov