Splited in Model View Controller paradigm
Merge branch 'MVCsplitting' into dev
Merge branch 'dev' into staging