Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/db.xml
Code cleaning!
Merge remote-tracking branch 'origin/master'
Code cleaning!