update
Merge branch 'master' of https://github.com/dzieyzone/lungo

Conflicts:
	app/sections/news/news1.html