Merge origin/master

Conflicts:
	Dezibel/src/de/dezibel/data/User.java
Merge origin/master