fix pick-one propagation problem and reorder some code

Conflicts:
	js/application.js
Merge branch 'pick-one' of https://github.com/tancrede/RedProject into pick-one

Conflicts:
	js/application.js