Complete the UI design.
***Change the structure of the whole solution***
Solve merge conflicts
Merge branch 'master' into working

Conflicts:
	.gitignore
Merge branch 'working'