Change alias method for _real_ method
Revert "Icon fonts moved to app/assets"

This reverts commit 2f27291bee127b67692f5220b2781e5dbb82fddb.
Icons css now search assets _the right way_
Merge ../x0y0

Conflicts:
	Gemfile.lock