updating properties and hooking up save method on feedback object
merge from origin/master; resolving conflict in require statements