Upgrade cancan to cancancan gem
Update wallpaper factory for spec
Test wallpaper factories
Auto test all factories
Merge branch 'migrate-to-cancancan'

Conflicts:
	Gemfile