Json
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	org/main/managers/Manager.java
	org/main/managers/Store.java