renaming jsp
moved criteria restriction constant strings to seperate class
added field to track if conncept suggestion was accepted
added field to track if conncept suggestion was accepted
item/concept mapping (wip)
merge conflicts
Tests fixed