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

Conflicts:
	app/js/contact.js