refactiring
refactiring
added history
added history
added history
added session
added session
added session
added session
users added
users added
sync
Merge branch 'fixHeroButtons'

Conflicts:
	.idea/workspace.xml
Merge branch 'fixHeroButtons'

Conflicts:
	.idea/workspace.xml