Added logout functionality
Production deployment added
Production deployment added
Haul password change code over into UsersController
Begin working on lock timeout
Merge branch 'develop' into develop-nigel-users

Conflicts:
	config/routes.rb
Added JS countdown with 5 seconds instead of 600 of idle time
Slightly stuck

Having difficulty with spec'ing sortable tables
Condense nav helper functions into nav_helper
As a result incur spec'ing bug with partial sidemenu view
Start in on imprintable_invariants
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david

Conflicts:
	app/views/shared/_sidebar_menu.html.erb
	config/routes.rb
	db/schema.rb
	spec/features/sizes_spec.rb
Countdown is ready to roll, still low times though
Lockout timer and associated specs are now fully functional!
Fix jquery.simulate.drag-sortable.js

Still can't figure out the spec..
Forgot password functionality is in
Ricky changed his mind on email again
Merge branch 'develop-nigel-users' into develop

Conflicts:
	config/routes.rb
	db/schema.rb
Updated readme, cleaned garbage from routes
Shouldn't schema.rb not be in the repository?
removed activities from schema
Merge branch 'develop-nigel' into develop
Created example for seeding data