developin
Merge branch 'master' into develop

Conflicts:
	githubteste/src/githubteste/asd.java
new joke added