Merge origin/master

Conflicts:
	src/githubcomnetbeans/GitHubComNetBeans.java
Merge origin/master