I begin the process of cleaning up the branch divergence that seems to have occurred last Wednesday.
Keeping feeView until I can sort out what needs to be done with it.
Merge branch 'dev-labelization-patch-0-cleaner' of https://github.com/v6/37coins into dev-labelization-patch-0-cleaner

Conflicts:
	webui/app/scripts/routers/pageController.js