Merge remote-tracking branch 'github/master'

Conflicts:
	amanecer/ext/background.jpg
	amanecer/ext/thumbnail_300x300.jpg