Merge branch 'master' into develop
FIXED: Comma error.
REMOVED: Old state info.
ADDED: Links to quickly change order state.
ADDED: Ajax call to update order status.
ADDED: Response handling for json reqs.
NEW schema.
ADDED: General rules to gitignore.
ADDED: Migration to add roles bitmask to users.
MIGRATED
ADDED: Cancan gem.
ADDED: Role handling methods for user.
ADDED: Edit method.
ADDED: Edit view.
FIXED: Sign out link.
ADDED: Cancan integration.
DELETE: wrong filetype.
ADDED: conditions to show admin only links.
ADDED: Abilities
MERGED: New features to master