Merge origin/master

Conflicts:
	.gitignore
	Collections/src/collections/Collections.java
	Collections/src/collections/MyArraySet.java
cokoliv
xx
Merge origin/master

Conflicts:
	Persons/nbproject/project.properties
Merge branch 'master' of https://github.com/danecek/mvn-osgi-library-2014 into HEAD

Conflicts:
	.gitignore
	derbyDB/src/main/java/org/lib/derbydb/DerbyDBActivator.java
	derbyDB/src/main/java/org/lib/derbydb/impl/DerbyDAOFactory.java
	richclient/src/main/java/org/lib/richclient/AddBookDialog.java
sssssssssssssssssgin/master into HEAD