idea project changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ideaproject/javaserializer/.idea/workspace.xml