changed app name
sfdsdf
Merge branch 'development'

Conflicts:
	.idea/workspace.xml