default changes
Merge branch 'master' of https://github.com/Redb3n/Rmanager

Conflicts:
	build/classes/add/Thumbs.db
	nbproject/private/private.xml
	src/add/Thumbs.db