Merged admin, user, employee changes with account changes
Merge branch 'master' of https://github.com/jhogan2072/npocentral

Conflicts:
	db/schema.rb