w
Merge branch 'master' of https://github.com/iron-hulk/KORENMobileAgent

Conflicts:
	.idea/workspace.xml
Persisting temporarily all context info