Fixed app.js for ziggeo problems
Merge branch 'master' of https://github.com/idamai/wonderlust.git

Conflicts:
	src/main/webapp/resources/js/app.js