mapfishapp - backported annotations for 13.06
merge 13.06 into 13.09