working
Merge remote-tracking branch 'origin/master'

Conflicts:
	lodosswar/teaser/js/app.js
working