Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java