Refactor

Conflicts:
	webui/app/controllers/test/FunctionalController.java