UPT
Merge branch 'master' of https://github.com/alexvonnemann/IMD

Conflicts:
	js/jquery_pagefunctions-ck.js