Merge origin/master

Conflicts:
	src/com/virahub/blackjava/BlackJava.java