stop tracking .idea
Merge branch 'BesnonLan-master'

Conflicts:
	.idea/workspace.xml
add conf
ui artifacts