admin stats
Merge commit '7947c352bfa8096d3d9615af185300104c7f3a23'
resolving push conflict
trying to push
Merge branch 'master' of https://github.com/duke-stephenson/rpe

Conflicts:
	client/modules/app/build/components/services/event-service.js
	client/modules/app/build/components/services/sale-service.js
	client/modules/app/build/src/account/account.js