Merge origin/master

Conflicts:
	softra/src/softra/Softra.java
Merge origin/master

Conflicts:
	softra/src/softra/Softra.java