Conflict.
Merge branch 'development' of ssh://git@github.com/lcsn/university.git
into development

Conflicts:
	arquillian_test/.gitignore
	arquillian_test/src/main/java/de/lsn/playground/test/entity/dao/PersonDAO.java
	arquillian_test/src/test/java/de/lsn/playground/test/entity/dao/PersonDAOTest.java
	arquillian_test2/.gitignore