Admin can add user
Admin/users_controller.rb showing as 'untracked'
Merge branch 'master' into admin-dashboard-users
Admin can now create admin users, overriding default user role
added event calendar
Admin can edit his/her personal info and change user's role
Merge pull request #127 from ianderse/jessica

added event calendar
fix tests
poltergeist for js testing
categories controller spec
configure rspec to use truncations for js tests
whitespace
refactor display table
jquery cookies
serving js
remove extraneous and un-tested methods
format
cart feature tests
serve js
categories controller tests