Displays triggers
Merge branch 'master' of https://github.com/Benny84/cits3200groupg

Conflicts:
	app/views/items/show.html.erb
update
Converted set trigger form into rails format, modified css and js to work with it, hidden field holds id for pid