as
a
fix
aa
git ignore fix
git works
Merge branch 'develop' into masterOPENSHIFT
aa
git fix
Merge branch 'masterOPENSHIFT'

Conflicts:
	.gitignore
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
add userSessionInfo
a
add usersi to orderbena
try1
changes