results module update
parameters
Merge branch 'master' of https://github.com/aalabarce/bw

Conflicts:
	app/config/parameters.yml