Merge master into Dev

Conflicts:
	src/simplehelloworld/SimpleHelloWorld.java
Merge origin/master