ui
Merge branch 'master' of https://github.com/apo-j/iluxe

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/apo-j/iluxe
architecture