do some changes on arvin_test_feature
Merge branch 'feature/arvin_test_feature' into develop

Conflicts:
	test_gitglow/test_gitglow.xcodeproj/project.xcworkspace/xcuserdata/arvintan.xcuserdatad/UserInterfaceState.xcuserstate