- add papertrail
- fix the double log output + add puma for development
- add event logging to erp
Merge branch 'master' into merger

Conflicts:
	db/schema.rb
- add event log fixes
- update value
- model should only update on 'edit', not create a new one each time
- fix bug
- adding specs