Maka tests
Configure MVC
Create html files and .json file
Fix pathes
Enable admin
Compete admin feature
fixes
Merge branch 'MVC' into ticket1
Merge branch 'ticket1'