Build up the mvc app skeleton
merge changes