Cleaning up code
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	muikku/src/main/webapp/resources/scripts/passingthrough.js