* Layout styles for price calculon
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	sites/default/modules/paja_course_price/paja_course_price.js
	sites/default/modules/paja_course_price/paja_course_price.module
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git
** Price calculon styles