Converted to simple MVC
Merge branch 'Dev'