khg
Merge branch 'master' of https://github.com/rtsuarez/GGInventory

Conflicts:
	.idea/workspace.xml