Merge pull request #2 from hecbuma/2-2-stable

change origantor for source, for adjusments
Replace other occurences of 'orginator' with source for adjustment
Update to load assets properly
Merge pull request #3 from jtapia/2-2-stable

Update to load assets properly
add missimg attributes in strong params