Changes to mockup pages
Mockup commit and rectifying merge conflict
Merge branch 'master' of https://github.com/entaria/Entaria.git