Revert "[20131228_kaifer_v40]erredit"

This reverts commit ace7c5efa236a85f57893b396db0d31601f1a772.

Conflicts:
	app.js
Revert 83db7d8..8a722c8

This rolls back to commit 83db7d82b832efe6d843f3035612aa3adfc1b918.
Revert 54249f3..6fe386f

This rolls back to commit 54249f330d180d54c1899198b27deaa053864dd3.