Revert "quick ziggeo"

This reverts commit e003b37086d51f6c14244c719cbf837525c63a31.
A bad commit from last time.
Merge branch 'master' of https://github.com/idamai/wonderlust.git

Conflicts:
	src/main/webapp/WEB-INF/views/dashboard.jsp
	src/main/webapp/resources/js/app.js