Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaSamples/.idea/workspace.xml
	JavaSamples/src/com/ozbilgic/java/samples/Main.java