encoding app controller
fix probabilistic model
Merge branch 'dev'

Conflicts:
	app/controllers/app_controller.rb
'fix merge'