Merge branch 'feature_1'

Conflicts:
	.gitignore
	appOne/appOne.v11.suo
update ignore