Merge origin/master

Conflicts:
	src/dataSource/Mapper.java
Merge origin/master