initial calculation controller - effective reduction + Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/routes