Added master template & MY_Controller
Merge branch 'masterpage' into develop