Merge pull request #8 from slnz/master

Pull everything to production for MVP
Merge pull request #10 from slnz/master

Production Issue with Ability Class
Merge pull request #12 from slnz/master

add admin link to menu
Merge pull request #14 from slnz/master

bugfix
Merge branch 'master' into production
add stats collection to production
Merge branch 'production'

Conflicts:
	Gemfile